Merge pull request #2919 from masatake/ada-expression-function

Ada: parse expression functions

Author: masatake

Units/parser-ada.r/ada-char-literal.d/expected.tags-e

@@ -0,0 +1,5 @@
+
+input.adb,158
+package body System.Val_Util isSystem.Val_Util/b
4,69
+  procedure Bad_Value (S : String) isBad_Value/p
6,102
+  procedure Not_Tagged  isNot_Tagged/p
11,236

Units/parser-ada.r/ada-char-literal.d/input.adb

@@ -0,0 +1,15 @@
+--- file: s-valuti.adb
+with System.Case_Util; use System.Case_Util;
+
+package body System.Val_Util is
+
+  procedure Bad_Value (S : String) is
+  begin
+    raise Constraint_Error with "bad input for 'Value: """ & S & '"';
+  end Bad_Value;
+
+  procedure Not_Tagged  is
+  begin
+    null;
+  end Not_Tagged;
+end System.Val_Util;

Units/parser-ada.r/ada-expression-function-with-generic.d/expected.tags-e

@@ -0,0 +1,9 @@
+
+input.adb,486
+procedure My_Package isMy_Package/p
1,0
+  package Generic_Integer_Images isGeneric_Integer_Images/s
5,71
+    function Digit_To_Character (X : Unsigned_Type) return Character;Digit_To_Character/f
6,107
+    type Unsigned_Type is range <>;Unsigned_Type
4,35
+  package body Generic_Integer_Images isGeneric_Integer_Images/b
9,208
+    function Digit_To_Character (X : Unsigned_Type) return Character isDigit_To_Character/f
10,249
+  type Signed_Address is rangeSigned_Address/t
14,379

Units/parser-ada.r/ada-expression-function-with-generic.d/input.adb

@@ -0,0 +1,18 @@
+procedure My_Package is
+
+  generic
+    type Unsigned_Type is range <>;
+  package Generic_Integer_Images is
+    function Digit_To_Character (X : Unsigned_Type) return Character;
+  end Generic_Integer_Images;
+
+  package body Generic_Integer_Images is
+    function Digit_To_Character (X : Unsigned_Type) return Character is
+      (Character'Val (0));
+  end Generic_Integer_Images;
+
+  type Signed_Address is range
+    -2**(Standard'Address_Size - 1) .. 2**(Standard'Address_Size - 1) - 1; 
+begin
+  null;
+end My_Package;

Units/parser-ada.r/ada-expression-function.d/args.ctags

@@ -0,0 +1 @@
+--sort=no

Units/parser-ada.r/ada-expression-function.d/expected.tags

@@ -0,0 +1,9 @@
+Test	input.adb	/^procedure Test is$/;"	r
+My_Type	input.adb	/^  My_Type : Boolean := True;$/;"	v	subprogram:Test	file:
+Tagged_Procedure	input.adb	/^  procedure Tagged_Procedure is$/;"	r	subprogram:Test	file:
+Boolean_As_String	input.adb	/^    function Boolean_As_String return String is$/;"	r	subprogram:Tagged_Procedure	file:
+Another_Boolean_As_String	input.adb	/^    function Another_Boolean_As_String return String is$/;"	r	subprogram:Tagged_Procedure	file:
+p0	input.adb	/^    procedure p0 is	$/;"	r	subprogram:Tagged_Procedure	file:
+Yet_Boolean_As_String	input.adb	/^    function Yet_Boolean_As_String return String is$/;"	r	subprogram:Tagged_Procedure	file:
+p1	input.adb	/^    procedure p1 is	$/;"	r	subprogram:Tagged_Procedure	file:
+Not_Tagged_Procedure	input.adb	/^  procedure Not_Tagged_Procedure is$/;"	r	subprogram:Test	file:

Units/parser-ada.r/ada-expression-function.d/input.adb

@@ -0,0 +1,38 @@
+with Ada.Text_IO;	
+
+procedure Test is
+
+  My_Type : Boolean := True;
+
+  procedure Tagged_Procedure is
+    function Boolean_As_String return String is
+      (case My_Type is
+         when True  => "True Value",
+         when False => "False Value");
+	 
+    function Another_Boolean_As_String return String is
+      (case My_Type is when True  => "; function dummy0 return String is (",
+         when False => "; function dummy1 return String is (");	      
+    procedure p0 is	
+    begin
+        Ada.Text_IO.put ("-0");
+    end p0;	 	 
+    function Yet_Boolean_As_String return String is
+      (case My_Type is
+         when True  => "1",
+         when False => "0");
+    procedure p1 is	
+    begin
+        Ada.Text_IO.put ("-1");
+    end p1;	 
+  begin
+    null;
+  end Tagged_Procedure;
+
+  procedure Not_Tagged_Procedure is
+  begin
+    null;
+  end Not_Tagged_Procedure;
+begin
+  null;
+end Test;

Units/parser-ada.r/ada-generic-in-package.d/expected.tags-e

@@ -0,0 +1,8 @@
+
+input.ads,278
+package My_Package isMy_Package/s
2,48
+  package Conversions isConversions/s
6,108
+    function From_Big_Real (Arg : Integer) return Num;From_Big_Real/f
7,133
+    type Num is digits <>;Num
5,81
+  type Missing_Tag is recordMissing_Tag/t
10,208
+    Num : Integer;Num
11,237

Units/parser-ada.r/ada-generic-in-package.d/input.ads

@@ -0,0 +1,14 @@
+--  Taken from #2925 submitted by @koenmeersman
+package My_Package is
+
+  generic
+    type Num is digits <>;
+  package Conversions is
+    function From_Big_Real (Arg : Integer) return Num;
+  end Conversions;
+
+  type Missing_Tag is record
+    Num : Integer;
+  end record;
+
+end My_Package;