From f8a6f7e8db366a384ef9cb88cbde0a2acfb12128 Mon Sep 17 00:00:00 2001 From: Pierre-Marie de Rodat Date: Fri, 9 Jun 2023 11:57:40 +0000 Subject: [PATCH] Python API: do not remove "f_" parsing field prefix in .dump() output --- langkit/templates/python_api/module_py.mako | 4 +- testsuite/tests/grammar/cuts/test.out | 12 +- .../tests/grammar/multiple_cuts/test.out | 142 +++++++++--------- testsuite/tests/grammar/newline/test.out | 16 +- testsuite/tests/properties/new_node/test.out | 8 +- 5 files changed, 90 insertions(+), 92 deletions(-) diff --git a/langkit/templates/python_api/module_py.mako b/langkit/templates/python_api/module_py.mako index 2578370c6..2a10ff813 100644 --- a/langkit/templates/python_api/module_py.mako +++ b/langkit/templates/python_api/module_py.mako @@ -1628,9 +1628,7 @@ class ${root_astnode_name}: print_node("item_{}".format(i), value) else: for name, value in self.iter_fields(): - # Remove the f_ prefix to have the same behavior as the Ada - # dumper. - print_node(name[2:], value) + print_node(name, value) def findall( self, diff --git a/testsuite/tests/grammar/cuts/test.out b/testsuite/tests/grammar/cuts/test.out index 70f51ec38..49c9412b5 100644 --- a/testsuite/tests/grammar/cuts/test.out +++ b/testsuite/tests/grammar/cuts/test.out @@ -3,7 +3,7 @@ FooNodeList buffer:1:1-1:6 |item_0: | Def buffer:1:1-1:6 -| |id: +| |f_id: | | Id buffer:1:5-1:6: a === invalid case 1: use cut === @@ -13,24 +13,24 @@ FooNodeList buffer:1:1-1:6 FooNodeList buffer:1:1-1:10 |item_0: | Def buffer:1:1-1:6 -| |id: +| |f_id: | | Id buffer:1:5-1:6: a |item_1: | Def buffer:1:7-1:10 -| |id: None +| |f_id: None === valid case 2: use stopcut === FooNodeList buffer:1:1-1:20 |item_0: | Def buffer:1:1-1:6 -| |id: +| |f_id: | | Id buffer:1:5-1:6: a |item_1: | Block buffer:1:7-1:20 -| |el: +| |f_el: | | VarDef buffer:1:9-1:18 -| | |id: +| | |f_id: | | | Id buffer:1:17-1:18: b Done diff --git a/testsuite/tests/grammar/multiple_cuts/test.out b/testsuite/tests/grammar/multiple_cuts/test.out index ca0443bdb..67396c630 100644 --- a/testsuite/tests/grammar/multiple_cuts/test.out +++ b/testsuite/tests/grammar/multiple_cuts/test.out @@ -3,32 +3,32 @@ FooNodeList buffer:1:1-1:6 |item_0: | Def buffer:1:1-1:6 -| |id1: +| |f_id1: | | Id buffer:1:5-1:6: a -| |id2: None -| |id3: None +| |f_id2: None +| |f_id3: None === complete case 2: def a (b) === FooNodeList buffer:1:1-1:10 |item_0: | Def buffer:1:1-1:10 -| |id1: +| |f_id1: | | Id buffer:1:5-1:6: a -| |id2: +| |f_id2: | | Id buffer:1:8-1:9: b -| |id3: None +| |f_id3: None === complete case 3: def a (b) {c} === FooNodeList buffer:1:1-1:14 |item_0: | Def buffer:1:1-1:14 -| |id1: +| |f_id1: | | Id buffer:1:5-1:6: a -| |id2: +| |f_id2: | | Id buffer:1:8-1:9: b -| |id3: +| |f_id3: | | Id buffer:1:12-1:13: c === complete case 4: var a === @@ -36,9 +36,9 @@ FooNodeList buffer:1:1-1:14 FooNodeList buffer:1:1-1:6 |item_0: | Var buffer:1:1-1:6 -| |id: +| |f_id: | | Id buffer:1:5-1:6: a -| |ids: +| |f_ids: | | IdList buffer:1:4-1:4 === complete case 5: var a (b) === @@ -46,9 +46,9 @@ FooNodeList buffer:1:1-1:6 FooNodeList buffer:1:1-1:10 |item_0: | Var buffer:1:1-1:10 -| |id: +| |f_id: | | Id buffer:1:5-1:6: a -| |ids: +| |f_ids: | | IdList buffer:1:8-1:9 | | |item_0: | | | Id buffer:1:8-1:9: b @@ -58,9 +58,9 @@ FooNodeList buffer:1:1-1:10 FooNodeList buffer:1:1-1:16 |item_0: | Var buffer:1:1-1:16 -| |id: +| |f_id: | | Id buffer:1:5-1:6: a -| |ids: +| |f_ids: | | IdList buffer:1:8-1:15 | | |item_0: | | | Id buffer:1:8-1:9: b @@ -74,22 +74,22 @@ FooNodeList buffer:1:1-1:16 FooNodeList buffer:1:1-1:8 |item_0: | Dot buffer:1:1-1:8 -| |id1: +| |f_id1: | | Id buffer:1:3-1:4: a -| |id2: +| |f_id2: | | Id buffer:1:6-1:7: b -| |id3: None +| |f_id3: None === complete case 8: . a (b) {c} === FooNodeList buffer:1:1-1:12 |item_0: | Dot buffer:1:1-1:12 -| |id1: +| |f_id1: | | Id buffer:1:3-1:4: a -| |id2: +| |f_id2: | | Id buffer:1:6-1:7: b -| |id3: +| |f_id3: | | Id buffer:1:10-1:11: c === complete case 9: , a b === @@ -97,10 +97,10 @@ FooNodeList buffer:1:1-1:12 FooNodeList buffer:1:1-1:6 |item_0: | Comma buffer:1:1-1:6 -| |id1: None -| |id2: +| |f_id1: None +| |f_id2: | | Id buffer:1:3-1:4: a -| |id3: +| |f_id3: | | Id buffer:1:5-1:6: b === complete case 10: (a) , b c === @@ -108,11 +108,11 @@ FooNodeList buffer:1:1-1:6 FooNodeList buffer:1:1-1:10 |item_0: | Comma buffer:1:1-1:10 -| |id1: +| |f_id1: | | Id buffer:1:2-1:3: a -| |id2: +| |f_id2: | | Id buffer:1:7-1:8: b -| |id3: +| |f_id3: | | Id buffer:1:9-1:10: c === incomplete case 1: def === @@ -122,9 +122,9 @@ FooNodeList buffer:1:1-1:10 FooNodeList buffer:1:1-1:4 |item_0: | Def buffer:1:1-1:4 -| |id1: None -| |id2: None -| |id3: None +| |f_id1: None +| |f_id2: None +| |f_id3: None === incomplete case 2: def a (b === @@ -133,11 +133,11 @@ FooNodeList buffer:1:1-1:4 FooNodeList buffer:1:1-1:9 |item_0: | Def buffer:1:1-1:9 -| |id1: +| |f_id1: | | Id buffer:1:5-1:6: a -| |id2: +| |f_id2: | | Id buffer:1:8-1:9: b -| |id3: None +| |f_id3: None === incomplete case 3: def a (b) {c === @@ -146,11 +146,11 @@ FooNodeList buffer:1:1-1:9 FooNodeList buffer:1:1-1:13 |item_0: | Def buffer:1:1-1:13 -| |id1: +| |f_id1: | | Id buffer:1:5-1:6: a -| |id2: +| |f_id2: | | Id buffer:1:8-1:9: b -| |id3: +| |f_id3: | | Id buffer:1:12-1:13: c === incomplete case 4: def a ( === @@ -160,10 +160,10 @@ FooNodeList buffer:1:1-1:13 FooNodeList buffer:1:1-1:8 |item_0: | Def buffer:1:1-1:8 -| |id1: +| |f_id1: | | Id buffer:1:5-1:6: a -| |id2: None -| |id3: None +| |f_id2: None +| |f_id3: None === incomplete case 5: def a (b) { === @@ -172,11 +172,11 @@ FooNodeList buffer:1:1-1:8 FooNodeList buffer:1:1-1:12 |item_0: | Def buffer:1:1-1:12 -| |id1: +| |f_id1: | | Id buffer:1:5-1:6: a -| |id2: +| |f_id2: | | Id buffer:1:8-1:9: b -| |id3: None +| |f_id3: None === incomplete case 6: def a ( { === @@ -187,10 +187,10 @@ FooNodeList buffer:1:1-1:12 FooNodeList buffer:1:1-1:10 |item_0: | Def buffer:1:1-1:10 -| |id1: +| |f_id1: | | Id buffer:1:5-1:6: a -| |id2: None -| |id3: None +| |f_id2: None +| |f_id3: None === incomplete case 7: def a (b {c === @@ -201,11 +201,11 @@ FooNodeList buffer:1:1-1:10 FooNodeList buffer:1:1-1:12 |item_0: | Def buffer:1:1-1:12 -| |id1: +| |f_id1: | | Id buffer:1:5-1:6: a -| |id2: +| |f_id2: | | Id buffer:1:8-1:9: b -| |id3: +| |f_id3: | | Id buffer:1:11-1:12: c === incomplete case 8: var === @@ -215,8 +215,8 @@ FooNodeList buffer:1:1-1:12 FooNodeList buffer:1:1-1:4 |item_0: | Var buffer:1:1-1:4 -| |id: None -| |ids: None +| |f_id: None +| |f_ids: None === incomplete case 9: var a ( === @@ -225,9 +225,9 @@ FooNodeList buffer:1:1-1:4 FooNodeList buffer:1:1-1:8 |item_0: | Var buffer:1:1-1:8 -| |id: +| |f_id: | | Id buffer:1:5-1:6: a -| |ids: +| |f_ids: | | IdList buffer:1:8-1:8 === incomplete case 10: var a () === @@ -238,9 +238,9 @@ FooNodeList buffer:1:1-1:8 FooNodeList buffer:1:1-1:8 |item_0: | Var buffer:1:1-1:8 -| |id: +| |f_id: | | Id buffer:1:5-1:6: a -| |ids: +| |f_ids: | | IdList buffer:1:8-1:8 === incomplete case 11: var a (b, c, d === @@ -250,9 +250,9 @@ FooNodeList buffer:1:1-1:8 FooNodeList buffer:1:1-1:15 |item_0: | Var buffer:1:1-1:15 -| |id: +| |f_id: | | Id buffer:1:5-1:6: a -| |ids: +| |f_ids: | | IdList buffer:1:8-1:15 | | |item_0: | | | Id buffer:1:8-1:9: b @@ -268,11 +268,11 @@ FooNodeList buffer:1:1-1:15 FooNodeList buffer:1:1-1:7 |item_0: | Dot buffer:1:1-1:7 -| |id1: +| |f_id1: | | Id buffer:1:3-1:4: a -| |id2: +| |f_id2: | | Id buffer:1:6-1:7: b -| |id3: None +| |f_id3: None === incomplete case 13: . a (b) { === @@ -281,11 +281,11 @@ FooNodeList buffer:1:1-1:7 FooNodeList buffer:1:1-1:10 |item_0: | Dot buffer:1:1-1:10 -| |id1: +| |f_id1: | | Id buffer:1:3-1:4: a -| |id2: +| |f_id2: | | Id buffer:1:6-1:7: b -| |id3: None +| |f_id3: None === incomplete case 14: . a ( { === @@ -296,10 +296,10 @@ FooNodeList buffer:1:1-1:10 FooNodeList buffer:1:1-1:8 |item_0: | Dot buffer:1:1-1:8 -| |id1: +| |f_id1: | | Id buffer:1:3-1:4: a -| |id2: None -| |id3: None +| |f_id2: None +| |f_id3: None === incomplete case 15: , b === @@ -313,11 +313,11 @@ FooNodeList buffer:1:1-1:1 FooNodeList buffer:1:1-1:8 |item_0: | Comma buffer:1:1-1:8 -| |id1: +| |f_id1: | | Id buffer:1:2-1:3: a -| |id2: +| |f_id2: | | Id buffer:1:7-1:8: b -| |id3: None +| |f_id3: None === incomplete case 17: (a , b === @@ -328,10 +328,10 @@ FooNodeList buffer:1:1-1:8 FooNodeList buffer:1:1-1:7 |item_0: | Comma buffer:1:1-1:7 -| |id1: +| |f_id1: | | Id buffer:1:2-1:3: a -| |id2: +| |f_id2: | | Id buffer:1:6-1:7: b -| |id3: None +| |f_id3: None Done diff --git a/testsuite/tests/grammar/newline/test.out b/testsuite/tests/grammar/newline/test.out index b4dbd7aec..9e3ca65c1 100644 --- a/testsuite/tests/grammar/newline/test.out +++ b/testsuite/tests/grammar/newline/test.out @@ -1,22 +1,22 @@ NewLineNode main.txt:1:1-2:2 -|lit_1: +|f_lit_1: | Literal main.txt:1:1-1:2: 1 -|lit_2: +|f_lit_2: | Literal main.txt:2:1-2:2: 2 Found errors: 1:3-1:4: Expected Newline, got Number IndentNode main.txt:1:1-2:5 -|lit_1: +|f_lit_1: | Literal main.txt:1:1-1:2: 1 -|lit_2: +|f_lit_2: | Literal main.txt:2:4-2:5: 2 CompositeNode main.txt:1:1-4:2 -|lit_1: +|f_lit_1: | Literal main.txt:1:1-1:2: 1 -|lit_2: +|f_lit_2: | Literal main.txt:2:1-2:2: 2 -|lit_3: +|f_lit_3: | Literal main.txt:3:4-3:5: 3 -|lit_4: +|f_lit_4: | Literal main.txt:4:1-4:2: 4 Done diff --git a/testsuite/tests/properties/new_node/test.out b/testsuite/tests/properties/new_node/test.out index 56b01df30..38c5ece22 100644 --- a/testsuite/tests/properties/new_node/test.out +++ b/testsuite/tests/properties/new_node/test.out @@ -1,9 +1,9 @@ main.py: Running... == prop == SynthNode main.txt:1:1-1:15 -|name: +|f_name: | Name main.txt:1:2-1:6: main -|items: +|f_items: | LiteralList main.txt:1:7-1:14 | |item_0: | | Literal main.txt:1:7-1:8: 1 @@ -14,9 +14,9 @@ SynthNode main.txt:1:1-1:15 == prop2 == SynthNode2 main.txt:1:1-1:15 -|name: +|f_name: | Name main.txt:1:2-1:6: main -|items: +|f_items: | LiteralList main.txt:1:7-1:14 | |item_0: | | Literal main.txt:1:7-1:8: 1