Skip to content

Commit b689814

Browse files
committed
Re-purpose the typename_regex test to generally test Matcher.TypeName
Change-Id: Ibec08337290cd7673a6fa000164d4cd81c5ce128 TN: RC14-025
1 parent 451b2d6 commit b689814

File tree

4 files changed

+18
-0
lines changed

4 files changed

+18
-0
lines changed

testsuite/tests/matchers/typename_regex/foo.adb renamed to testsuite/tests/matchers/typename/foo.adb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,16 @@ procedure Foo is
22
type My_Int_1 is new Integer;
33
type My_Int_2 is new Integer;
44

5+
type My_Nat is new Natural;
6+
57
I1 : My_Int_1 := 10;
68
I2 : My_Int_2 := 20;
9+
N : My_Nat := 30;
10+
11+
I : Integer := 0;
712
begin
813
I1 := I1 + My_Int_1 (I2); -- BREAK
914
I2 := I2 + My_Int_2 (I1);
15+
N := N + 1;
16+
I := I + 1;
1017
end Foo;

testsuite/tests/matchers/typename_regex/pp.py renamed to testsuite/tests/matchers/typename/pp.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,15 @@ def to_string(self):
1212
return 'My_Int ({})'.format(int(self.value))
1313

1414

15+
class MyNatPrinter(PrettyPrinter):
16+
name = 'My Nat'
17+
type_pattern = Match.TypeName(name='foo.my_nat')
18+
19+
def to_string(self):
20+
return 'My_Nat ({})'.format(int(self.value))
21+
22+
1523
printers = GDBPrettyPrinters('test')
1624
printers.append(MyIntPrinter)
25+
printers.append(MyNatPrinter)
1726
gdb.selected_frame().function().symtab.objfile.pretty_printers.append(printers)

testsuite/tests/matchers/typename_regex/test.py renamed to testsuite/tests/matchers/typename/test.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@
99
gdb.test('source pp.py', '')
1010
gdb.print_expr('i1', 'My_Int (10)')
1111
gdb.print_expr('i2', 'My_Int (20)')
12+
gdb.print_expr('n', 'My_Nat (30)')
13+
gdb.print_expr('i', '0')

0 commit comments

Comments
 (0)