summaryrefslogtreecommitdiff
path: root/libgm2/libm2iso
diff options
context:
space:
mode:
authorGaius Mulley <gaiusmod2@gmail.com>2023-05-17 00:18:56 +0100
committerGaius Mulley <gaiusmod2@gmail.com>2023-05-17 00:18:56 +0100
commit509eef9314b24eff20a5dbdd92f6ab52e2c0c786 (patch)
tree2a98b53840b958c0e75259c03000d4d8bb4c8b70 /libgm2/libm2iso
parentf25d2de17663a0132f9fe090dee39d3b1132067b (diff)
downloadgcc-509eef9314b24eff20a5dbdd92f6ab52e2c0c786.tar.gz
PR modula2/109879 WholeIO.ReadCard and ReadInt should consume leading space
The Read{TYPE} procedures in LongIO, LongWholeIO, RealIO, ShortWholeIO and WholeIO all require skip space functionality. A new module TextUtil is supplied with this functionality and the previous modules have been changed to call SkipSpaces. gcc/m2/ChangeLog: PR modula2/109879 * gm2-libs-iso/LongIO.mod (ReadReal): Call SkipSpaces. * gm2-libs-iso/LongWholeIO.mod (ReadInt): Call SkipSpaces. (ReadCard): Call SkipSpaces. * gm2-libs-iso/RealIO.mod (ReadReal): Call SkipSpaces. * gm2-libs-iso/ShortWholeIO.mod: (ReadInt): Call SkipSpaces. (ReadCard): Call SkipSpaces. * gm2-libs-iso/TextIO.mod: Import SkipSpaces. * gm2-libs-iso/WholeIO.mod (ReadInt): Call SkipSpaces. (ReadCard): Call SkipSpaces. * gm2-libs-iso/TextUtil.def: New file. * gm2-libs-iso/TextUtil.mod: New file. libgm2/ChangeLog: PR modula2/109879 * Makefile.in: Regenerate. * aclocal.m4: Regenerate. * libm2cor/Makefile.in: Regenerate. * libm2iso/Makefile.am (M2DEFS): Add TextUtil.def. (M2MODS): Add TextUtil.mod. * libm2iso/Makefile.in: Regenerate. * libm2log/Makefile.in: Regenerate. * libm2min/Makefile.in: Regenerate. * libm2pim/Makefile.in: Regenerate. gcc/testsuite/ChangeLog: PR modula2/109879 * gm2/isolib/run/pass/testreadint.mod: New test. Signed-off-by: Gaius Mulley <gaiusmod2@gmail.com>
Diffstat (limited to 'libgm2/libm2iso')
-rw-r--r--libgm2/libm2iso/Makefile.am2
-rw-r--r--libgm2/libm2iso/Makefile.in16
2 files changed, 11 insertions, 7 deletions
diff --git a/libgm2/libm2iso/Makefile.am b/libgm2/libm2iso/Makefile.am
index d48ef0692ab..8c70f5c5ee0 100644
--- a/libgm2/libm2iso/Makefile.am
+++ b/libgm2/libm2iso/Makefile.am
@@ -134,6 +134,7 @@ M2DEFS = ChanConsts.def CharClass.def \
SWholeIO.def SysClock.def \
SYSTEM.def TermFile.def \
TERMINATION.def TextIO.def \
+ TextUtil.def \
WholeConv.def WholeIO.def \
WholeStr.def wrapsock.def \
wraptime.def
@@ -173,6 +174,7 @@ M2MODS = ChanConsts.mod CharClass.mod \
SWholeIO.mod SysClock.mod \
SYSTEM.mod TermFile.mod \
TERMINATION.mod TextIO.mod \
+ TextUtil.mod \
WholeConv.mod WholeIO.mod \
WholeStr.mod
diff --git a/libgm2/libm2iso/Makefile.in b/libgm2/libm2iso/Makefile.in
index b8936e745fe..163b87a521e 100644
--- a/libgm2/libm2iso/Makefile.in
+++ b/libgm2/libm2iso/Makefile.in
@@ -107,15 +107,15 @@ host_triplet = @host@
target_triplet = @target@
subdir = libm2iso
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../libtool.m4 \
+ $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
+ $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
+ $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/../config/depstand.m4 \
$(top_srcdir)/../config/lead-dot.m4 \
$(top_srcdir)/../config/multi.m4 \
$(top_srcdir)/../config/no-executables.m4 \
- $(top_srcdir)/../config/override.m4 \
- $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \
- $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
- $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/../config/override.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am
@@ -176,8 +176,8 @@ libm2iso_la_LIBADD =
@BUILD_ISOLIB_TRUE@ Storage.lo StreamFile.lo StringChan.lo \
@BUILD_ISOLIB_TRUE@ Strings.lo SWholeIO.lo SysClock.lo \
@BUILD_ISOLIB_TRUE@ SYSTEM.lo TermFile.lo TERMINATION.lo \
-@BUILD_ISOLIB_TRUE@ TextIO.lo WholeConv.lo WholeIO.lo \
-@BUILD_ISOLIB_TRUE@ WholeStr.lo
+@BUILD_ISOLIB_TRUE@ TextIO.lo TextUtil.lo WholeConv.lo \
+@BUILD_ISOLIB_TRUE@ WholeIO.lo WholeStr.lo
@BUILD_ISOLIB_TRUE@am_libm2iso_la_OBJECTS = $(am__objects_1) \
@BUILD_ISOLIB_TRUE@ ErrnoCategory.lo wraptime.lo RTco.lo \
@BUILD_ISOLIB_TRUE@ libm2iso_la-wrapsock.lo
@@ -512,6 +512,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS)
@BUILD_ISOLIB_TRUE@ SWholeIO.def SysClock.def \
@BUILD_ISOLIB_TRUE@ SYSTEM.def TermFile.def \
@BUILD_ISOLIB_TRUE@ TERMINATION.def TextIO.def \
+@BUILD_ISOLIB_TRUE@ TextUtil.def \
@BUILD_ISOLIB_TRUE@ WholeConv.def WholeIO.def \
@BUILD_ISOLIB_TRUE@ WholeStr.def wrapsock.def \
@BUILD_ISOLIB_TRUE@ wraptime.def
@@ -551,6 +552,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS)
@BUILD_ISOLIB_TRUE@ SWholeIO.mod SysClock.mod \
@BUILD_ISOLIB_TRUE@ SYSTEM.mod TermFile.mod \
@BUILD_ISOLIB_TRUE@ TERMINATION.mod TextIO.mod \
+@BUILD_ISOLIB_TRUE@ TextUtil.mod \
@BUILD_ISOLIB_TRUE@ WholeConv.mod WholeIO.mod \
@BUILD_ISOLIB_TRUE@ WholeStr.mod