From e7aea0fa3f2f3b8becc30a8ff11f835f93cc8939 Mon Sep 17 00:00:00 2001 From: Robert Dewar Date: Thu, 9 Apr 2009 12:22:41 +0000 Subject: [PATCH] Make-lang.in, [...]: Reorganize style units. 2009-04-09 Robert Dewar * gcc-interface/Make-lang.in, style.ads, style.adb: Reorganize style units. * styleg-c.ads, styleg-c.adb: Removed, no longer used. From-SVN: r145831 --- gcc/ada/ChangeLog | 7 + gcc/ada/gcc-interface/Make-lang.in | 110 ++++++------ gcc/ada/style.ads | 83 ++++----- gcc/ada/styleg-c.adb | 261 ----------------------------- gcc/ada/styleg-c.ads | 64 ------- 5 files changed, 97 insertions(+), 428 deletions(-) delete mode 100644 gcc/ada/styleg-c.adb delete mode 100644 gcc/ada/styleg-c.ads diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 3f908f78b98..61cdc11d8f7 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,10 @@ +2009-04-09 Robert Dewar + + * gcc-interface/Make-lang.in, style.ads, style.adb: Reorganize style + units. + + * styleg-c.ads, styleg-c.adb: Removed, no longer used. + 2009-04-09 Robert Dewar * g-comver.adb: Minor reformatting. diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in index a7470c9a214..3ff1e9a15a0 100644 --- a/gcc/ada/gcc-interface/Make-lang.in +++ b/gcc/ada/gcc-interface/Make-lang.in @@ -159,7 +159,7 @@ GNAT_ADA_OBJS = ada/ada.o ada/a-charac.o ada/a-chlat1.o ada/a-except.o \ ada/sem_res.o ada/sem_smem.o ada/sem_type.o ada/sem_util.o ada/sem_vfpt.o \ ada/sem_warn.o ada/sinfo-cn.o ada/sinfo.o ada/sinput.o ada/sinput-d.o \ ada/sinput-l.o ada/snames.o ada/sprint.o ada/stand.o ada/stringt.o \ - ada/style.o ada/styleg.o ada/styleg-c.o ada/switch.o ada/switch-c.o \ + ada/style.o ada/styleg.o ada/switch.o ada/switch-c.o \ ada/stylesw.o ada/validsw.o ada/system.o ada/table.o ada/targparm.o \ ada/tbuild.o ada/tree_gen.o ada/tree_in.o \ ada/tree_io.o ada/treepr.o ada/treeprs.o \ @@ -1455,7 +1455,7 @@ ada/cstand.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/sem_type.ads ada/sem_util.ads ada/sem_util.adb ada/sinfo.ads \ ada/sinfo.adb ada/sinput.ads ada/sinput.adb ada/snames.ads \ ada/stand.ads ada/stringt.ads ada/style.ads ada/styleg.ads \ - ada/styleg.adb ada/styleg-c.ads ada/stylesw.ads ada/system.ads \ + ada/styleg.adb ada/stylesw.ads ada/system.ads \ ada/s-crc32.ads ada/s-crc32.adb ada/s-exctab.ads ada/s-htable.ads \ ada/s-imenne.ads ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads \ ada/s-rident.ads ada/s-secsta.ads ada/s-soflin.ads ada/s-stache.ads \ @@ -1527,7 +1527,7 @@ ada/errout.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/nlists.ads ada/nlists.adb ada/opt.ads ada/output.ads ada/scans.ads \ ada/sinfo.ads ada/sinfo.adb ada/sinput.ads ada/sinput.adb \ ada/snames.ads ada/stand.ads ada/stringt.ads ada/style.ads \ - ada/styleg.ads ada/styleg.adb ada/styleg-c.ads ada/stylesw.ads \ + ada/styleg.ads ada/styleg.adb ada/stylesw.ads \ ada/system.ads ada/s-exctab.ads ada/s-htable.ads ada/s-imenne.ads \ ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads ada/s-secsta.ads \ ada/s-soflin.ads ada/s-stache.ads ada/s-stalib.ads ada/s-stoele.ads \ @@ -1589,7 +1589,7 @@ ada/exp_aggr.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/sem_warn.ads ada/sinfo.ads ada/sinfo.adb ada/sinput.ads \ ada/snames.ads ada/sprint.ads ada/stand.ads ada/stringt.ads \ ada/stringt.adb ada/style.ads ada/styleg.ads ada/styleg.adb \ - ada/styleg-c.ads ada/stylesw.ads ada/system.ads ada/s-crc32.ads \ + ada/stylesw.ads ada/system.ads ada/s-crc32.ads \ ada/s-exctab.ads ada/s-exctab.adb ada/s-htable.ads ada/s-imenne.ads \ ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads ada/s-rident.ads \ ada/s-secsta.ads ada/s-soflin.ads ada/s-stache.ads ada/s-stalib.ads \ @@ -1647,7 +1647,7 @@ ada/exp_attr.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/sem_type.ads ada/sem_util.ads ada/sem_util.adb ada/sinfo.ads \ ada/sinfo.adb ada/sinput.ads ada/snames.ads ada/stand.ads \ ada/stringt.ads ada/stringt.adb ada/style.ads ada/styleg.ads \ - ada/styleg.adb ada/styleg-c.ads ada/stylesw.ads ada/system.ads \ + ada/styleg.adb ada/stylesw.ads ada/system.ads \ ada/s-carun8.ads ada/s-crc32.ads ada/s-exctab.ads ada/s-htable.ads \ ada/s-imenne.ads ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads \ ada/s-rident.ads ada/s-secsta.ads ada/s-soflin.ads ada/s-stache.ads \ @@ -1817,7 +1817,7 @@ ada/exp_ch5.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/sem_util.ads ada/sem_util.adb ada/sem_warn.ads ada/sinfo.ads \ ada/sinfo.adb ada/sinput.ads ada/snames.ads ada/sprint.ads \ ada/stand.ads ada/stringt.ads ada/stringt.adb ada/style.ads \ - ada/styleg.ads ada/styleg.adb ada/styleg-c.ads ada/stylesw.ads \ + ada/styleg.ads ada/styleg.adb ada/stylesw.ads \ ada/system.ads ada/s-crc32.ads ada/s-exctab.ads ada/s-htable.ads \ ada/s-imenne.ads ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads \ ada/s-rident.ads ada/s-secsta.ads ada/s-soflin.ads ada/s-stache.ads \ @@ -1853,7 +1853,7 @@ ada/exp_ch6.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/sem_util.adb ada/sem_warn.ads ada/sinfo.ads ada/sinfo.adb \ ada/sinput.ads ada/snames.ads ada/sprint.ads ada/stand.ads \ ada/stringt.ads ada/style.ads ada/styleg.ads ada/styleg.adb \ - ada/styleg-c.ads ada/stylesw.ads ada/system.ads ada/s-crc32.ads \ + ada/stylesw.ads ada/system.ads ada/s-crc32.ads \ ada/s-exctab.ads ada/s-htable.ads ada/s-imenne.ads ada/s-memory.ads \ ada/s-os_lib.ads ada/s-parame.ads ada/s-rident.ads ada/s-secsta.ads \ ada/s-soflin.ads ada/s-stache.ads ada/s-stalib.ads ada/s-stoele.ads \ @@ -1932,7 +1932,7 @@ ada/exp_ch9.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/sem_type.ads ada/sem_util.ads ada/sem_util.adb ada/sinfo.ads \ ada/sinfo.adb ada/sinput.ads ada/snames.ads ada/stand.ads \ ada/stringt.ads ada/style.ads ada/styleg.ads ada/styleg.adb \ - ada/styleg-c.ads ada/stylesw.ads ada/system.ads ada/s-crc32.ads \ + ada/stylesw.ads ada/system.ads ada/s-crc32.ads \ ada/s-exctab.ads ada/s-htable.ads ada/s-imenne.ads ada/s-memory.ads \ ada/s-os_lib.ads ada/s-parame.ads ada/s-rident.ads ada/s-secsta.ads \ ada/s-soflin.ads ada/s-stache.ads ada/s-stalib.ads ada/s-stoele.ads \ @@ -1961,7 +1961,7 @@ ada/exp_code.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/sem_util.adb ada/sem_warn.ads ada/sinfo.ads ada/sinfo.adb \ ada/sinput.ads ada/snames.ads ada/stand.ads ada/stringt.ads \ ada/stringt.adb ada/style.ads ada/styleg.ads ada/styleg.adb \ - ada/styleg-c.ads ada/stylesw.ads ada/system.ads ada/s-carun8.ads \ + ada/stylesw.ads ada/system.ads ada/s-carun8.ads \ ada/s-crc32.ads ada/s-exctab.ads ada/s-htable.ads ada/s-imenne.ads \ ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads ada/s-rident.ads \ ada/s-secsta.ads ada/s-soflin.ads ada/s-stache.ads ada/s-stalib.ads \ @@ -2010,7 +2010,7 @@ ada/exp_disp.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/sem_util.ads ada/sem_util.adb ada/sinfo.ads ada/sinfo.adb \ ada/sinput.ads ada/snames.ads ada/stand.ads ada/stringt.ads \ ada/stringt.adb ada/style.ads ada/styleg.ads ada/styleg.adb \ - ada/styleg-c.ads ada/stylesw.ads ada/system.ads ada/s-carun8.ads \ + ada/stylesw.ads ada/system.ads ada/s-carun8.ads \ ada/s-crc32.ads ada/s-exctab.ads ada/s-htable.ads ada/s-imenne.ads \ ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads ada/s-rident.ads \ ada/s-secsta.ads ada/s-soflin.ads ada/s-stache.ads ada/s-stalib.ads \ @@ -2356,7 +2356,7 @@ ada/freeze.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/sem_type.ads ada/sem_util.ads ada/sem_util.adb ada/sem_warn.ads \ ada/sinfo.ads ada/sinfo.adb ada/sinput.ads ada/snames.ads ada/stand.ads \ ada/stringt.ads ada/style.ads ada/styleg.ads ada/styleg.adb \ - ada/styleg-c.ads ada/stylesw.ads ada/system.ads ada/s-crc32.ads \ + ada/stylesw.ads ada/system.ads ada/s-crc32.ads \ ada/s-exctab.ads ada/s-exctab.adb ada/s-htable.ads ada/s-imenne.ads \ ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads ada/s-rident.ads \ ada/s-secsta.ads ada/s-soflin.ads ada/s-stache.ads ada/s-stalib.ads \ @@ -2385,7 +2385,7 @@ ada/frontend.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/sem_warn.ads ada/sinfo.ads ada/sinfo.adb ada/sinput.ads \ ada/sinput.adb ada/sinput-l.ads ada/snames.ads ada/sprint.ads \ ada/stand.ads ada/stringt.ads ada/style.ads ada/styleg.ads \ - ada/styleg.adb ada/styleg-c.ads ada/stylesw.ads ada/system.ads \ + ada/styleg.adb ada/stylesw.ads ada/system.ads \ ada/s-crc32.ads ada/s-crc32.adb ada/s-exctab.ads ada/s-htable.ads \ ada/s-imenne.ads ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads \ ada/s-rident.ads ada/s-soflin.ads ada/s-stache.ads ada/s-stalib.ads \ @@ -2573,7 +2573,7 @@ ada/layout.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/sem_type.ads ada/sem_util.ads ada/sem_util.adb ada/sinfo.ads \ ada/sinfo.adb ada/sinput.ads ada/snames.ads ada/stand.ads \ ada/stringt.ads ada/style.ads ada/styleg.ads ada/styleg.adb \ - ada/styleg-c.ads ada/stylesw.ads ada/system.ads ada/s-crc32.ads \ + ada/stylesw.ads ada/system.ads ada/s-crc32.ads \ ada/s-exctab.ads ada/s-htable.ads ada/s-imenne.ads ada/s-memory.ads \ ada/s-os_lib.ads ada/s-parame.ads ada/s-rident.ads ada/s-secsta.ads \ ada/s-soflin.ads ada/s-stache.ads ada/s-stalib.ads ada/s-stoele.ads \ @@ -2596,7 +2596,7 @@ ada/lib-load.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/scans.ads ada/scn.ads ada/scng.ads ada/scng.adb ada/sinfo.ads \ ada/sinfo.adb ada/sinput.ads ada/sinput.adb ada/sinput-l.ads \ ada/snames.ads ada/stand.ads ada/stringt.ads ada/style.ads \ - ada/styleg.ads ada/styleg.adb ada/styleg-c.ads ada/stylesw.ads \ + ada/styleg.ads ada/styleg.adb ada/stylesw.ads \ ada/system.ads ada/s-crc32.ads ada/s-crc32.adb ada/s-exctab.ads \ ada/s-htable.ads ada/s-imenne.ads ada/s-memory.ads ada/s-os_lib.ads \ ada/s-parame.ads ada/s-rident.ads ada/s-soflin.ads ada/s-stache.ads \ @@ -2631,7 +2631,7 @@ ada/lib-writ.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/scans.ads ada/scn.ads ada/scng.ads ada/scng.adb ada/sinfo.ads \ ada/sinfo.adb ada/sinput.ads ada/sinput.adb ada/snames.ads \ ada/stand.ads ada/stringt.ads ada/stringt.adb ada/style.ads \ - ada/styleg.ads ada/styleg.adb ada/styleg-c.ads ada/stylesw.ads \ + ada/styleg.ads ada/styleg.adb ada/stylesw.ads \ ada/system.ads ada/s-casuti.ads ada/s-carun8.ads ada/s-crc32.ads \ ada/s-crc32.adb ada/s-exctab.ads ada/s-htable.ads ada/s-imenne.ads \ ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads ada/s-rident.ads \ @@ -2816,7 +2816,7 @@ ada/par.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads ada/a-uncdea.ads \ ada/sinfo.ads ada/sinfo.adb ada/sinfo-cn.ads ada/sinput.ads \ ada/sinput.adb ada/sinput-l.ads ada/snames.ads ada/snames.adb \ ada/stand.ads ada/stringt.ads ada/stringt.adb ada/style.ads \ - ada/styleg.ads ada/styleg.adb ada/styleg-c.ads ada/stylesw.ads \ + ada/styleg.ads ada/styleg.adb ada/stylesw.ads \ ada/system.ads ada/s-carun8.ads ada/s-crc32.ads ada/s-crc32.adb \ ada/s-exctab.ads ada/s-exctab.adb ada/s-htable.ads ada/s-imenne.ads \ ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads ada/s-rident.ads \ @@ -2853,7 +2853,7 @@ ada/prepcomp.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/prepcomp.ads ada/prepcomp.adb ada/scans.ads ada/scn.ads \ ada/scng.ads ada/scng.adb ada/sinput.ads ada/sinput.adb \ ada/sinput-l.ads ada/snames.ads ada/stringt.ads ada/stringt.adb \ - ada/style.ads ada/styleg.ads ada/styleg.adb ada/styleg-c.ads \ + ada/style.ads ada/styleg.ads ada/styleg.adb \ ada/stylesw.ads ada/system.ads ada/s-crc32.ads ada/s-crc32.adb \ ada/s-exctab.ads ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads \ ada/s-secsta.ads ada/s-soflin.ads ada/s-stache.ads ada/s-stalib.ads \ @@ -3064,7 +3064,7 @@ ada/scn.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads ada/a-uncdea.ads \ ada/restrict.ads ada/rident.ads ada/scans.ads ada/scn.ads ada/scn.adb \ ada/scng.ads ada/scng.adb ada/sinfo.ads ada/sinfo.adb ada/sinput.ads \ ada/sinput.adb ada/snames.ads ada/stringt.ads ada/stringt.adb \ - ada/style.ads ada/styleg.ads ada/styleg.adb ada/styleg-c.ads \ + ada/style.ads ada/styleg.ads ada/styleg.adb \ ada/stylesw.ads ada/system.ads ada/s-carun8.ads ada/s-crc32.ads \ ada/s-crc32.adb ada/s-exctab.ads ada/s-htable.ads ada/s-imenne.ads \ ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads ada/s-rident.ads \ @@ -3133,7 +3133,7 @@ ada/sem_aggr.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/sem_util.adb ada/sem_warn.ads ada/sinfo.ads ada/sinfo.adb \ ada/sinput.ads ada/snames.ads ada/sprint.ads ada/stand.ads \ ada/stringt.ads ada/stringt.adb ada/style.ads ada/styleg.ads \ - ada/styleg.adb ada/styleg-c.ads ada/stylesw.ads ada/system.ads \ + ada/styleg.adb ada/stylesw.ads ada/system.ads \ ada/s-crc32.ads ada/s-exctab.ads ada/s-htable.ads ada/s-imenne.ads \ ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads ada/s-rident.ads \ ada/s-secsta.ads ada/s-soflin.ads ada/s-stache.ads ada/s-stalib.ads \ @@ -3167,7 +3167,7 @@ ada/sem_attr.o : ada/ada.ads ada/a-charac.ads ada/a-chlat1.ads \ ada/sinfo.ads ada/sinfo.adb ada/sinput.ads ada/sinput.adb \ ada/snames.ads ada/snames.adb ada/sprint.ads ada/stand.ads \ ada/stringt.ads ada/stringt.adb ada/style.ads ada/styleg.ads \ - ada/styleg.adb ada/styleg-c.ads ada/stylesw.ads ada/system.ads \ + ada/styleg.adb ada/stylesw.ads ada/system.ads \ ada/s-carun8.ads ada/s-exctab.ads ada/s-exctab.adb ada/s-htable.ads \ ada/s-imenne.ads ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads \ ada/s-rident.ads ada/s-soflin.ads ada/s-stache.ads ada/s-stalib.ads \ @@ -3221,7 +3221,7 @@ ada/sem_cat.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/sem_type.ads ada/sem_util.ads ada/sem_util.adb ada/sinfo.ads \ ada/sinfo.adb ada/sinput.ads ada/snames.ads ada/stand.ads \ ada/stringt.ads ada/style.ads ada/styleg.ads ada/styleg.adb \ - ada/styleg-c.ads ada/stylesw.ads ada/system.ads ada/s-crc32.ads \ + ada/stylesw.ads ada/system.ads ada/s-crc32.ads \ ada/s-exctab.ads ada/s-htable.ads ada/s-imenne.ads ada/s-memory.ads \ ada/s-os_lib.ads ada/s-parame.ads ada/s-rident.ads ada/s-secsta.ads \ ada/s-soflin.ads ada/s-stache.ads ada/s-stalib.ads ada/s-stoele.ads \ @@ -3251,7 +3251,7 @@ ada/sem_ch10.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/sem_warn.ads ada/sinfo.ads ada/sinfo.adb ada/sinfo-cn.ads \ ada/sinput.ads ada/sinput.adb ada/snames.ads ada/stand.ads \ ada/stringt.ads ada/style.ads ada/styleg.ads ada/styleg.adb \ - ada/styleg-c.ads ada/stylesw.ads ada/system.ads ada/s-crc32.ads \ + ada/stylesw.ads ada/system.ads ada/s-crc32.ads \ ada/s-exctab.ads ada/s-htable.ads ada/s-imenne.ads ada/s-memory.ads \ ada/s-os_lib.ads ada/s-parame.ads ada/s-rident.ads ada/s-secsta.ads \ ada/s-soflin.ads ada/s-stache.ads ada/s-stalib.ads ada/s-stoele.ads \ @@ -3304,7 +3304,7 @@ ada/sem_ch12.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/sem_warn.ads ada/sinfo.ads ada/sinfo.adb ada/sinfo-cn.ads \ ada/sinput.ads ada/sinput-l.ads ada/snames.ads ada/stand.ads \ ada/stringt.ads ada/style.ads ada/styleg.ads ada/styleg.adb \ - ada/styleg-c.ads ada/stylesw.ads ada/system.ads ada/s-crc32.ads \ + ada/stylesw.ads ada/system.ads ada/s-crc32.ads \ ada/s-exctab.ads ada/s-exctab.adb ada/s-htable.ads ada/s-htable.adb \ ada/s-imenne.ads ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads \ ada/s-rident.ads ada/s-secsta.ads ada/s-soflin.ads ada/s-stache.ads \ @@ -3381,7 +3381,7 @@ ada/sem_ch3.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/sem_util.adb ada/sem_warn.ads ada/sinfo.ads ada/sinfo.adb \ ada/sinput.ads ada/snames.ads ada/sprint.ads ada/stand.ads \ ada/stringt.ads ada/stringt.adb ada/style.ads ada/styleg.ads \ - ada/styleg.adb ada/styleg-c.ads ada/stylesw.ads ada/system.ads \ + ada/styleg.adb ada/stylesw.ads ada/system.ads \ ada/s-crc32.ads ada/s-exctab.ads ada/s-htable.ads ada/s-imenne.ads \ ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads ada/s-rident.ads \ ada/s-secsta.ads ada/s-soflin.ads ada/s-stache.ads ada/s-stalib.ads \ @@ -3413,7 +3413,7 @@ ada/sem_ch4.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/sem_res.ads ada/sem_res.adb ada/sem_type.ads ada/sem_util.ads \ ada/sem_util.adb ada/sem_warn.ads ada/sinfo.ads ada/sinfo.adb \ ada/sinput.ads ada/snames.ads ada/stand.ads ada/stringt.ads \ - ada/style.ads ada/styleg.ads ada/styleg.adb ada/styleg-c.ads \ + ada/style.ads ada/styleg.ads ada/styleg.adb \ ada/stylesw.ads ada/system.ads ada/s-crc32.ads ada/s-exctab.ads \ ada/s-htable.ads ada/s-imenne.ads ada/s-memory.ads ada/s-os_lib.ads \ ada/s-parame.ads ada/s-rident.ads ada/s-secsta.ads ada/s-soflin.ads \ @@ -3447,7 +3447,7 @@ ada/sem_ch5.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/sem_util.ads ada/sem_util.adb ada/sem_warn.ads ada/sem_warn.adb \ ada/sinfo.ads ada/sinfo.adb ada/sinput.ads ada/snames.ads \ ada/sprint.ads ada/stand.ads ada/stringt.ads ada/stringt.adb \ - ada/style.ads ada/styleg.ads ada/styleg.adb ada/styleg-c.ads \ + ada/style.ads ada/styleg.ads ada/styleg.adb \ ada/stylesw.ads ada/system.ads ada/s-crc32.ads ada/s-exctab.ads \ ada/s-htable.ads ada/s-imenne.ads ada/s-memory.ads ada/s-os_lib.ads \ ada/s-parame.ads ada/s-rident.ads ada/s-secsta.ads ada/s-soflin.ads \ @@ -3480,7 +3480,7 @@ ada/sem_ch6.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/sem_util.adb ada/sem_warn.ads ada/sinfo.ads ada/sinfo.adb \ ada/sinfo-cn.ads ada/sinput.ads ada/sinput.adb ada/snames.ads \ ada/snames.adb ada/stand.ads ada/stringt.ads ada/stringt.adb \ - ada/style.ads ada/styleg.ads ada/styleg.adb ada/styleg-c.ads \ + ada/style.ads ada/styleg.ads ada/styleg.adb \ ada/stylesw.ads ada/system.ads ada/s-carun8.ads ada/s-crc32.ads \ ada/s-exctab.ads ada/s-htable.ads ada/s-imenne.ads ada/s-memory.ads \ ada/s-os_lib.ads ada/s-parame.ads ada/s-rident.ads ada/s-secsta.ads \ @@ -3512,7 +3512,7 @@ ada/sem_ch7.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/sem_util.ads ada/sem_util.adb ada/sem_warn.ads ada/sinfo.ads \ ada/sinfo.adb ada/sinput.ads ada/sinput.adb ada/snames.ads \ ada/snames.adb ada/stand.ads ada/stringt.ads ada/style.ads \ - ada/styleg.ads ada/styleg.adb ada/styleg-c.ads ada/stylesw.ads \ + ada/styleg.ads ada/styleg.adb ada/stylesw.ads \ ada/system.ads ada/s-crc32.ads ada/s-exctab.ads ada/s-htable.ads \ ada/s-imenne.ads ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads \ ada/s-rident.ads ada/s-secsta.ads ada/s-soflin.ads ada/s-stache.ads \ @@ -3546,7 +3546,7 @@ ada/sem_ch8.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/sem_util.adb ada/sem_warn.ads ada/sinfo.ads ada/sinfo.adb \ ada/sinfo-cn.ads ada/sinput.ads ada/sinput.adb ada/snames.ads \ ada/stand.ads ada/stringt.ads ada/style.ads ada/styleg.ads \ - ada/styleg.adb ada/styleg-c.ads ada/stylesw.ads ada/system.ads \ + ada/styleg.adb ada/stylesw.ads ada/system.ads \ ada/s-crc32.ads ada/s-exctab.ads ada/s-htable.ads ada/s-imenne.ads \ ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads ada/s-rident.ads \ ada/s-secsta.ads ada/s-soflin.ads ada/s-stache.ads ada/s-stalib.ads \ @@ -3579,7 +3579,7 @@ ada/sem_ch9.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/sem_warn.ads ada/sinfo.ads ada/sinfo.adb ada/sinput.ads \ ada/sinput.adb ada/snames.ads ada/sprint.ads ada/stand.ads \ ada/stringt.ads ada/style.ads ada/styleg.ads ada/styleg.adb \ - ada/styleg-c.ads ada/stylesw.ads ada/system.ads ada/s-crc32.ads \ + ada/stylesw.ads ada/system.ads ada/s-crc32.ads \ ada/s-exctab.ads ada/s-htable.ads ada/s-imenne.ads ada/s-memory.ads \ ada/s-os_lib.ads ada/s-parame.ads ada/s-rident.ads ada/s-secsta.ads \ ada/s-soflin.ads ada/s-stache.ads ada/s-stalib.ads ada/s-stoele.ads \ @@ -3609,7 +3609,7 @@ ada/sem_disp.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/sem_disp.adb ada/sem_eval.ads ada/sem_res.ads ada/sem_type.ads \ ada/sem_util.ads ada/sem_util.adb ada/sinfo.ads ada/sinfo.adb \ ada/sinput.ads ada/snames.ads ada/stand.ads ada/stringt.ads \ - ada/style.ads ada/styleg.ads ada/styleg.adb ada/styleg-c.ads \ + ada/style.ads ada/styleg.ads ada/styleg.adb \ ada/stylesw.ads ada/system.ads ada/s-crc32.ads ada/s-exctab.ads \ ada/s-htable.ads ada/s-imenne.ads ada/s-memory.ads ada/s-os_lib.ads \ ada/s-parame.ads ada/s-rident.ads ada/s-secsta.ads ada/s-soflin.ads \ @@ -3658,7 +3658,7 @@ ada/sem_elab.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/sem_type.ads ada/sem_util.ads ada/sem_util.adb ada/sinfo.ads \ ada/sinfo.adb ada/sinput.ads ada/sinput.adb ada/snames.ads \ ada/stand.ads ada/stringt.ads ada/style.ads ada/styleg.ads \ - ada/styleg.adb ada/styleg-c.ads ada/stylesw.ads ada/system.ads \ + ada/styleg.adb ada/stylesw.ads ada/system.ads \ ada/s-crc32.ads ada/s-exctab.ads ada/s-htable.ads ada/s-imenne.ads \ ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads ada/s-rident.ads \ ada/s-secsta.ads ada/s-soflin.ads ada/s-stache.ads ada/s-stalib.ads \ @@ -3705,7 +3705,7 @@ ada/sem_eval.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/sem_res.adb ada/sem_type.ads ada/sem_util.ads ada/sem_util.adb \ ada/sem_warn.ads ada/sinfo.ads ada/sinfo.adb ada/sinput.ads \ ada/snames.ads ada/stand.ads ada/stringt.ads ada/stringt.adb \ - ada/style.ads ada/styleg.ads ada/styleg.adb ada/styleg-c.ads \ + ada/style.ads ada/styleg.ads ada/styleg.adb \ ada/stylesw.ads ada/system.ads ada/s-crc32.ads ada/s-exctab.ads \ ada/s-htable.ads ada/s-imenne.ads ada/s-memory.ads ada/s-os_lib.ads \ ada/s-parame.ads ada/s-rident.ads ada/s-secsta.ads ada/s-soflin.ads \ @@ -3791,7 +3791,7 @@ ada/sem_prag.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/sem_warn.ads ada/sinfo.ads ada/sinfo.adb ada/sinfo-cn.ads \ ada/sinput.ads ada/sinput.adb ada/snames.ads ada/snames.adb \ ada/stand.ads ada/stringt.ads ada/stringt.adb ada/style.ads \ - ada/styleg.ads ada/styleg.adb ada/styleg-c.ads ada/stylesw.ads \ + ada/styleg.ads ada/styleg.adb ada/stylesw.ads \ ada/system.ads ada/s-carun8.ads ada/s-crc32.ads ada/s-exctab.ads \ ada/s-exctab.adb ada/s-htable.ads ada/s-imenne.ads ada/s-memory.ads \ ada/s-os_lib.ads ada/s-parame.ads ada/s-rident.ads ada/s-secsta.ads \ @@ -3829,7 +3829,7 @@ ada/sem_res.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/sinfo.ads ada/sinfo.adb ada/sinput.ads ada/sinput.adb \ ada/snames.ads ada/sprint.ads ada/stand.ads ada/stringt.ads \ ada/stringt.adb ada/style.ads ada/styleg.ads ada/styleg.adb \ - ada/styleg-c.ads ada/stylesw.ads ada/system.ads ada/s-carun8.ads \ + ada/stylesw.ads ada/system.ads ada/s-carun8.ads \ ada/s-crc32.ads ada/s-exctab.ads ada/s-htable.ads ada/s-imenne.ads \ ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads ada/s-rident.ads \ ada/s-secsta.ads ada/s-soflin.ads ada/s-stache.ads ada/s-stalib.ads \ @@ -3873,7 +3873,7 @@ ada/sem_type.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/sem_eval.ads ada/sem_res.ads ada/sem_type.ads ada/sem_type.adb \ ada/sem_util.ads ada/sem_util.adb ada/sinfo.ads ada/sinfo.adb \ ada/sinput.ads ada/snames.ads ada/stand.ads ada/stringt.ads \ - ada/style.ads ada/styleg.ads ada/styleg.adb ada/styleg-c.ads \ + ada/style.ads ada/styleg.ads ada/styleg.adb \ ada/stylesw.ads ada/system.ads ada/s-crc32.ads ada/s-exctab.ads \ ada/s-htable.ads ada/s-imenne.ads ada/s-memory.ads ada/s-os_lib.ads \ ada/s-parame.ads ada/s-rident.ads ada/s-secsta.ads ada/s-soflin.ads \ @@ -3902,7 +3902,7 @@ ada/sem_util.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/sem_type.ads ada/sem_util.ads ada/sem_util.adb ada/sem_warn.ads \ ada/sinfo.ads ada/sinfo.adb ada/sinput.ads ada/sinput.adb \ ada/snames.ads ada/stand.ads ada/stringt.ads ada/stringt.adb \ - ada/style.ads ada/styleg.ads ada/styleg.adb ada/styleg-c.ads \ + ada/style.ads ada/styleg.ads ada/styleg.adb \ ada/stylesw.ads ada/system.ads ada/s-carun8.ads ada/s-crc32.ads \ ada/s-crc32.adb ada/s-exctab.ads ada/s-htable.ads ada/s-imenne.ads \ ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads ada/s-rident.ads \ @@ -3941,22 +3941,22 @@ ada/sem_warn.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/lib-xref.ads ada/namet.ads ada/namet.adb ada/nlists.ads \ ada/nlists.adb ada/nmake.ads ada/opt.ads ada/output.ads ada/rident.ads \ ada/rtsfind.ads ada/scans.ads ada/scn.ads ada/scng.ads ada/scng.adb \ - ada/sem.ads ada/sem_attr.ads ada/sem_aux.ads ada/sem_ch6.ads \ - ada/sem_ch8.ads ada/sem_eval.ads ada/sem_res.ads ada/sem_type.ads \ - ada/sem_util.ads ada/sem_util.adb ada/sem_warn.ads ada/sem_warn.adb \ - ada/sinfo.ads ada/sinfo.adb ada/sinput.ads ada/sinput.adb \ - ada/snames.ads ada/stand.ads ada/stringt.ads ada/style.ads \ - ada/styleg.ads ada/styleg.adb ada/styleg-c.ads ada/stylesw.ads \ - ada/system.ads ada/s-crc32.ads ada/s-exctab.ads ada/s-htable.ads \ - ada/s-imenne.ads ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads \ - ada/s-rident.ads ada/s-secsta.ads ada/s-soflin.ads ada/s-stache.ads \ - ada/s-stalib.ads ada/s-stoele.ads ada/s-stoele.adb ada/s-strops.ads \ - ada/s-sopco3.ads ada/s-sopco4.ads ada/s-sopco5.ads ada/s-string.ads \ - ada/s-traent.ads ada/s-unstyp.ads ada/s-utf_32.ads ada/s-wchcon.ads \ - ada/table.ads ada/table.adb ada/targparm.ads ada/tbuild.ads \ - ada/tree_io.ads ada/ttypes.ads ada/types.ads ada/uintp.ads \ - ada/uintp.adb ada/uname.ads ada/unchconv.ads ada/unchdeal.ads \ - ada/urealp.ads ada/widechar.ads + ada/sem.ads ada/sem_attr.ads ada/sem_ch6.ads ada/sem_ch8.ads \ + ada/sem_eval.ads ada/sem_res.ads ada/sem_type.ads ada/sem_util.ads \ + ada/sem_util.adb ada/sem_warn.ads ada/sem_warn.adb ada/sinfo.ads \ + ada/sinfo.adb ada/sinput.ads ada/sinput.adb ada/snames.ads \ + ada/stand.ads ada/stringt.ads ada/stringt.adb ada/style.ads \ + ada/styleg.ads ada/styleg.adb ada/stylesw.ads \ + ada/system.ads ada/s-carun8.ads ada/s-crc32.ads ada/s-exctab.ads \ + ada/s-htable.ads ada/s-imenne.ads ada/s-memory.ads ada/s-os_lib.ads \ + ada/s-parame.ads ada/s-rident.ads ada/s-secsta.ads ada/s-soflin.ads \ + ada/s-stache.ads ada/s-stalib.ads ada/s-stoele.ads ada/s-stoele.adb \ + ada/s-strops.ads ada/s-sopco3.ads ada/s-sopco4.ads ada/s-sopco5.ads \ + ada/s-string.ads ada/s-traent.ads ada/s-unstyp.ads ada/s-utf_32.ads \ + ada/s-wchcon.ads ada/table.ads ada/table.adb ada/targparm.ads \ + ada/tbuild.ads ada/tree_io.ads ada/ttypes.ads ada/types.ads \ + ada/types.adb ada/uintp.ads ada/uintp.adb ada/uname.ads \ + ada/unchconv.ads ada/unchdeal.ads ada/urealp.ads ada/widechar.ads ada/sinfo-cn.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/a-uncdea.ads ada/alloc.ads ada/atree.ads ada/atree.adb \ @@ -4016,7 +4016,7 @@ ada/sinput-l.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/prepcomp.ads ada/scans.ads ada/scn.ads ada/scng.ads ada/scng.adb \ ada/sinfo.ads ada/sinfo.adb ada/sinput.ads ada/sinput-l.ads \ ada/sinput-l.adb ada/snames.ads ada/stringt.ads ada/style.ads \ - ada/styleg.ads ada/styleg.adb ada/styleg-c.ads ada/stylesw.ads \ + ada/styleg.ads ada/styleg.adb ada/stylesw.ads \ ada/system.ads ada/s-crc32.ads ada/s-crc32.adb ada/s-exctab.ads \ ada/s-htable.ads ada/s-imenne.ads ada/s-memory.ads ada/s-os_lib.ads \ ada/s-parame.ads ada/s-soflin.ads ada/s-stache.ads ada/s-stalib.ads \ @@ -4096,7 +4096,7 @@ ada/style.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \ ada/namet.adb ada/nlists.ads ada/nlists.adb ada/opt.ads ada/output.ads \ ada/scans.ads ada/sinfo.ads ada/sinfo.adb ada/sinput.ads ada/sinput.adb \ ada/snames.ads ada/stand.ads ada/style.ads ada/styleg.ads \ - ada/styleg.adb ada/styleg-c.ads ada/styleg-c.adb ada/stylesw.ads \ + ada/styleg.adb ada/stylesw.ads \ ada/system.ads ada/s-exctab.ads ada/s-htable.ads ada/s-imenne.ads \ ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads ada/s-secsta.ads \ ada/s-stalib.ads ada/s-stoele.ads ada/s-stoele.adb ada/s-strops.ads \ diff --git a/gcc/ada/style.ads b/gcc/ada/style.ads index 07e57023ff4..7afc818ad63 100644 --- a/gcc/ada/style.ads +++ b/gcc/ada/style.ads @@ -23,38 +23,53 @@ -- -- ------------------------------------------------------------------------------ --- This package collects all the routines used for style checking, as --- activated by the relevant command line option. These are gathered in a --- separate package so that they can more easily be customized. Calls to --- these subprograms are only made if Opt.Style_Check is set True. +-- This package collects all the routines used for style checking in the +-- compiler, as activated by the relevant command line option. These are +-- gathered in a separate package so that they can more easily be customized. +-- Calls to these subprograms are only made if Opt.Style_Check is set True. with Errout; with Styleg; -with Styleg.C; with Types; use Types; package Style is + procedure Body_With_No_Spec (N : Node_Id); + -- Called where N is a subprogram body node for a subprogram body + -- for which no spec was given, i.e. a body acting as its own spec. + + procedure Check_Array_Attribute_Index + (N : Node_Id; + E1 : Node_Id; + D : Int); + -- Called for an array attribute specifying an index number. N is the + -- node for the attribute, and E1 is the index expression (Empty if none + -- present). If E1 is present, it is known to be a static integer. D is + -- the number of dimensions of the array. + + procedure Check_Identifier + (Ref : Node_Or_Entity_Id; + Def : Node_Or_Entity_Id); + -- Check style of identifier occurrence. Ref is an N_Identifier node whose + -- spelling is to be checked against the Chars spelling in identifier node + -- Def (which may be either an N_Identifier, or N_Defining_Identifier node) + + procedure Missing_Overriding (N : Node_Id; E : Entity_Id); + -- Called where N is the declaration or body of an overriding operation, + -- and the node does not have an overriding_indicator. + + procedure Subprogram_Not_In_Alpha_Order (Name : Node_Id); + -- Called if Name is the name of a subprogram body in a package body + -- that is not in alphabetical order. + + -- Remaining style routines come from instantiation of Styleg + package Style_Inst is new Styleg (Errout.Error_Msg, Errout.Error_Msg_S, Errout.Error_Msg_SC, Errout.Error_Msg_SP); - -- Instantiation of Styleg for all subprograms that do not depend directly - -- depend on the GNAT tree. - - package Style_C_Inst is new Style_Inst.C - (Errout.Error_Msg_N); - -- Instantiation of Styleg.C for the subprograms that depend directly - -- on the GNAT tree. - - -- All subroutines below are renames of subroutines in the two - -- instantiations above. - - procedure Body_With_No_Spec (N : Node_Id) - renames Style_C_Inst.Body_With_No_Spec; - -- Called where N is a subprogram body node for a subprogram body - -- for which no spec was given, i.e. a body acting as its own spec. + -- Instantiation of Styleg for compiler use procedure Check_Abs_Not renames Style_Inst.Check_Abs_Not; @@ -64,16 +79,6 @@ package Style is renames Style_Inst.Check_Apostrophe; -- Called after scanning an apostrophe to check spacing - procedure Check_Array_Attribute_Index - (N : Node_Id; - E1 : Node_Id; - D : Int) - renames Style_C_Inst.Check_Array_Attribute_Index; - -- Called for an array attribute specifying an index number. N is the - -- node for the attribute, and E1 is the index expression (Empty if none - -- present). If E1 is present, it is known to be a static integer. D is - -- the number of dimensions of the array. - procedure Check_Arrow renames Style_Inst.Check_Arrow; -- Called after scanning out an arrow to check spacing @@ -128,14 +133,6 @@ package Style is renames Style_Inst.Check_HT; -- Called with Scan_Ptr pointing to a horizontal tab character - procedure Check_Identifier - (Ref : Node_Or_Entity_Id; - Def : Node_Or_Entity_Id) - renames Style_C_Inst.Check_Identifier; - -- Check style of identifier occurrence. Ref is an N_Identifier node whose - -- spelling is to be checked against the Chars spelling in identifier node - -- Def (which may be either an N_Identifier, or N_Defining_Identifier node) - procedure Check_Indentation renames Style_Inst.Check_Indentation; -- Called at the start of a new statement or declaration, with Token_Ptr @@ -187,11 +184,6 @@ package Style is -- Called after scanning a conditional expression that has at least one -- level of parentheses around the entire expression. - procedure Missing_Overriding (N : Node_Id; E : Entity_Id) - renames Style_C_Inst.Missing_Overriding; - -- Called where N is the declaration or body of an overriding operation of - -- a tagged type, and does not have an overriding_indicator. - function Mode_In_Check return Boolean renames Style_Inst.Mode_In_Check; -- Determines whether style checking is active and the Mode_In_Check is @@ -224,9 +216,4 @@ package Style is -- Determines whether style checking is active and the RM column check -- mode is set requiring checking of RM format layout. - procedure Subprogram_Not_In_Alpha_Order (Name : Node_Id) - renames Style_C_Inst.Subprogram_Not_In_Alpha_Order; - -- Called if Name is the name of a subprogram body in a package body - -- that is not in alphabetical order. - end Style; diff --git a/gcc/ada/styleg-c.adb b/gcc/ada/styleg-c.adb deleted file mode 100644 index 5734471ecfd..00000000000 --- a/gcc/ada/styleg-c.adb +++ /dev/null @@ -1,261 +0,0 @@ ------------------------------------------------------------------------------- --- -- --- GNAT COMPILER COMPONENTS -- --- -- --- S T Y L E G . C -- --- -- --- B o d y -- --- -- --- Copyright (C) 1992-2008, Free Software Foundation, Inc. -- --- -- --- GNAT is free software; you can redistribute it and/or modify it under -- --- terms of the GNU General Public License as published by the Free Soft- -- --- ware Foundation; either version 3, or (at your option) any later ver- -- --- sion. GNAT is distributed in the hope that it will be useful, but WITH- -- --- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -- --- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -- --- for more details. You should have received a copy of the GNU General -- --- Public License distributed with GNAT; see file COPYING3. If not, go to -- --- http://www.gnu.org/licenses for a complete copy of the license. -- --- -- --- GNAT was originally developed by the GNAT team at New York University. -- --- Extensive contributions were provided by Ada Core Technologies Inc. -- --- -- ------------------------------------------------------------------------------- - -with Atree; use Atree; -with Casing; use Casing; -with Csets; use Csets; -with Einfo; use Einfo; -with Err_Vars; use Err_Vars; -with Namet; use Namet; -with Sinfo; use Sinfo; -with Sinput; use Sinput; -with Stand; use Stand; -with Stylesw; use Stylesw; - -package body Styleg.C is - - ----------------------- - -- Body_With_No_Spec -- - ----------------------- - - -- If the check specs mode (-gnatys) is set, then all subprograms must - -- have specs unless they are parameterless procedures that are not child - -- units at the library level (i.e. they are possible main programs). - - procedure Body_With_No_Spec (N : Node_Id) is - begin - if Style_Check_Specs then - if Nkind (Parent (N)) = N_Compilation_Unit then - declare - Spec : constant Node_Id := Specification (N); - Defnm : constant Node_Id := Defining_Unit_Name (Spec); - - begin - if Nkind (Spec) = N_Procedure_Specification - and then Nkind (Defnm) = N_Defining_Identifier - and then No (First_Formal (Defnm)) - then - return; - end if; - end; - end if; - - Error_Msg_N ("(style) subprogram body has no previous spec", N); - end if; - end Body_With_No_Spec; - - --------------------------------- - -- Check_Array_Attribute_Index -- - --------------------------------- - - procedure Check_Array_Attribute_Index - (N : Node_Id; - E1 : Node_Id; - D : Int) - is - begin - if Style_Check_Array_Attribute_Index then - if D = 1 and then Present (E1) then - Error_Msg_N - ("(style) index number not allowed for one dimensional array", - E1); - elsif D > 1 and then No (E1) then - Error_Msg_N - ("(style) index number required for multi-dimensional array", - N); - end if; - end if; - end Check_Array_Attribute_Index; - - ---------------------- - -- Check_Identifier -- - ---------------------- - - -- In check references mode (-gnatyr), identifier uses must be cased - -- the same way as the corresponding identifier declaration. - - procedure Check_Identifier - (Ref : Node_Or_Entity_Id; - Def : Node_Or_Entity_Id) - is - Sref : Source_Ptr := Sloc (Ref); - Sdef : Source_Ptr := Sloc (Def); - Tref : Source_Buffer_Ptr; - Tdef : Source_Buffer_Ptr; - Nlen : Nat; - Cas : Casing_Type; - - begin - -- If reference does not come from source, nothing to check - - if not Comes_From_Source (Ref) then - return; - - -- If previous error on either node/entity, ignore - - elsif Error_Posted (Ref) or else Error_Posted (Def) then - return; - - -- Case of definition comes from source - - elsif Comes_From_Source (Def) then - - -- Check same casing if we are checking references - - if Style_Check_References then - Tref := Source_Text (Get_Source_File_Index (Sref)); - Tdef := Source_Text (Get_Source_File_Index (Sdef)); - - -- Ignore operator name case completely. This also catches the - -- case of where one is an operator and the other is not. This - -- is a phenomenon from rewriting of operators as functions, - -- and is to be ignored. - - if Tref (Sref) = '"' or else Tdef (Sdef) = '"' then - return; - - else - while Tref (Sref) = Tdef (Sdef) loop - - -- If end of identifier, all done - - if not Identifier_Char (Tref (Sref)) then - return; - - -- Otherwise loop continues - - else - Sref := Sref + 1; - Sdef := Sdef + 1; - end if; - end loop; - - -- Fall through loop when mismatch between identifiers - -- If either identifier is not terminated, error. - - if Identifier_Char (Tref (Sref)) - or else - Identifier_Char (Tdef (Sdef)) - then - Error_Msg_Node_1 := Def; - Error_Msg_Sloc := Sloc (Def); - Error_Msg - ("(style) bad casing of & declared#", Sref); - return; - - -- Else end of identifiers, and they match - - else - return; - end if; - end if; - end if; - - -- Case of definition in package Standard - - elsif Sdef = Standard_Location - or else - Sdef = Standard_ASCII_Location - then - -- Check case of identifiers in Standard - - if Style_Check_Standard then - Tref := Source_Text (Get_Source_File_Index (Sref)); - - -- Ignore operators - - if Tref (Sref) = '"' then - null; - - -- Otherwise determine required casing of Standard entity - - else - -- ASCII is all upper case - - if Entity (Ref) = Standard_ASCII then - Cas := All_Upper_Case; - - -- Special names in ASCII are also all upper case - - elsif Sdef = Standard_ASCII_Location then - Cas := All_Upper_Case; - - -- All other entities are in mixed case - - else - Cas := Mixed_Case; - end if; - - Nlen := Length_Of_Name (Chars (Ref)); - - -- Now check if we have the right casing - - if Determine_Casing - (Tref (Sref .. Sref + Source_Ptr (Nlen) - 1)) = Cas - then - null; - else - Name_Len := Integer (Nlen); - Name_Buffer (1 .. Name_Len) := - String (Tref (Sref .. Sref + Source_Ptr (Nlen) - 1)); - Set_Casing (Cas); - Error_Msg_Name_1 := Name_Enter; - Error_Msg_N - ("(style) bad casing of %% declared in Standard", Ref); - end if; - end if; - end if; - end if; - end Check_Identifier; - - ------------------------ - -- Missing_Overriding -- - ------------------------ - - procedure Missing_Overriding (N : Node_Id; E : Entity_Id) is - begin - if Style_Check_Missing_Overriding and then Comes_From_Source (N) then - if Nkind (N) = N_Subprogram_Body then - Error_Msg_N - ("(style) missing OVERRIDING indicator in body of&", E); - else - Error_Msg_N - ("(style) missing OVERRIDING indicator in declaration of&", E); - end if; - end if; - end Missing_Overriding; - - ----------------------------------- - -- Subprogram_Not_In_Alpha_Order -- - ----------------------------------- - - procedure Subprogram_Not_In_Alpha_Order (Name : Node_Id) is - begin - if Style_Check_Order_Subprograms then - Error_Msg_N - ("(style) subprogram body& not in alphabetical order", Name); - end if; - end Subprogram_Not_In_Alpha_Order; -end Styleg.C; diff --git a/gcc/ada/styleg-c.ads b/gcc/ada/styleg-c.ads deleted file mode 100644 index b3fc1f61fce..00000000000 --- a/gcc/ada/styleg-c.ads +++ /dev/null @@ -1,64 +0,0 @@ ------------------------------------------------------------------------------- --- -- --- GNAT COMPILER COMPONENTS -- --- -- --- S T Y L E G . C -- --- -- --- S p e c -- --- -- --- Copyright (C) 1992-2008, Free Software Foundation, Inc. -- --- -- --- GNAT is free software; you can redistribute it and/or modify it under -- --- terms of the GNU General Public License as published by the Free Soft- -- --- ware Foundation; either version 3, or (at your option) any later ver- -- --- sion. GNAT is distributed in the hope that it will be useful, but WITH- -- --- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -- --- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -- --- for more details. You should have received a copy of the GNU General -- --- Public License distributed with GNAT; see file COPYING3. If not, go to -- --- http://www.gnu.org/licenses for a complete copy of the license. -- --- -- --- GNAT was originally developed by the GNAT team at New York University. -- --- Extensive contributions were provided by Ada Core Technologies Inc. -- --- -- ------------------------------------------------------------------------------- - --- This generic package, instantiated in package Style, contains routines --- used by the compiler for style checking. These routines are in a separate --- package because they depend on the GNAT tree (Atree, Sinfo, ...). - -generic - with procedure Error_Msg_N (Msg : String; N : Node_Or_Entity_Id); - -- Output a message at the Sloc of the given node - -package Styleg.C is - - procedure Body_With_No_Spec (N : Node_Id); - -- Called where N is a subprogram body node for a subprogram body - -- for which no spec was given, i.e. a body acting as its own spec. - - procedure Check_Array_Attribute_Index - (N : Node_Id; - E1 : Node_Id; - D : Int); - -- Called for an array attribute specifying an index number. N is the - -- node for the attribute, and E1 is the index expression (Empty if none - -- present). If E1 is present, it is known to be a static integer. D is - -- the number of dimensions of the array. - - procedure Check_Identifier - (Ref : Node_Or_Entity_Id; - Def : Node_Or_Entity_Id); - -- Check style of identifier occurrence. Ref is an N_Identifier node whose - -- spelling is to be checked against the Chars spelling in identifier node - -- Def (which may be either an N_Identifier, or N_Defining_Identifier node) - - procedure Missing_Overriding (N : Node_Id; E : Entity_Id); - -- Called where N is the declaration or body of an overriding operation, - -- and the node does not have an overriding_indicator. - - procedure Subprogram_Not_In_Alpha_Order (Name : Node_Id); - -- Called if Name is the name of a subprogram body in a package body - -- that is not in alphabetical order. - -end Styleg.C;