2012-05-15 Arnaud Charlet <charlet@adacore.com>

	* gnat1drv.adb: Enable Exception_Extra_Info in CodePeer_Mode.

2012-05-15  Sergey Rybin  <rybin@adacore.com frybin>

	* gnat_ugn.texi (Complexity Metrics Control section): Fix
	reference to McCabe's book defining complexity metrics.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@187524 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ada/gnat1drv.adb b/gcc/ada/gnat1drv.adb
index 783babd..93c16f2 100644 (file)
--- a/gcc/ada/gnat1drv.adb
+++ b/gcc/ada/gnat1drv.adb
@@ -267,6 +267,12 @@ procedure Gnat1drv is
 
          Force_ALI_Tree_File := True;
          Try_Semantics := True;
+
+         --  Enable Exception_Extra_Info for now, to avoid extra messages
+         --  on controlled operations.
+         --  ??? To be revised.
+
+         Exception_Extra_Info := True;
       end if;
 
       --  Set Configurable_Run_Time mode if system.ads flag set

diff --git a/gcc/ada/gnat_ugn.texi b/gcc/ada/gnat_ugn.texi
index 6adfb20..ca7a188 100644 (file)
--- a/gcc/ada/gnat_ugn.texi
+++ b/gcc/ada/gnat_ugn.texi
@@ -14779,7 +14779,7 @@ statements unless @option{^-ne^NO_EXITS_AS_GOTOS^} option is specified.
 The Ada essential complexity metric defined here is intended to quantify
 the extent to which the software is unstructured. It is adapted from
 the McCabe essential complexity metric defined in
-http://www.mccabe.com/pdf/nist235r.pdf but is modified to be more
+@url{http://www.mccabe.com/pdf/mccabe-nist235r.pdf} but is modified to be more
 suitable for typical Ada usage. For example, short circuit forms
 are not penalized as unstructured in the Ada essential complexity metric.