From 5e159a049c4f592050e58505adb41b78133c4d0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20AMIARD?= Date: Mon, 10 Jun 2019 15:06:50 +0200 Subject: [PATCH] S529-023: Rename DocAnnotations.val -> value --- ada/extensions/nodes/basic_decl/bodies | 2 +- ada/language/ast.py | 2 +- ada/testsuite/tests/properties/doc/test.py | 2 +- contrib/laldoc/laldoc/__init__.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ada/extensions/nodes/basic_decl/bodies b/ada/extensions/nodes/basic_decl/bodies index 090f6df6f..20eb173ce 100644 --- a/ada/extensions/nodes/basic_decl/bodies +++ b/ada/extensions/nodes/basic_decl/bodies @@ -106,7 +106,7 @@ begin begin DSL_Key.Items := Key; DSL_Val.Items := Val; - Ret.Items (Idx) := (Key => DSL_Key, Val => DSL_Val); + Ret.Items (Idx) := (Key => DSL_Key, Value => DSL_Val); end; Idx := Idx + 1; end loop; diff --git a/ada/language/ast.py b/ada/language/ast.py index 52da2ade8..eff2e416d 100644 --- a/ada/language/ast.py +++ b/ada/language/ast.py @@ -1013,7 +1013,7 @@ class DocAnnotation(Struct): Documentation annotation. """ key = UserField(T.String, doc="Annotation key") - val = UserField(T.String, doc="Annotation value") + value = UserField(T.String, doc="Annotation value") @abstract diff --git a/ada/testsuite/tests/properties/doc/test.py b/ada/testsuite/tests/properties/doc/test.py index 71a743e41..040bcb169 100644 --- a/ada/testsuite/tests/properties/doc/test.py +++ b/ada/testsuite/tests/properties/doc/test.py @@ -25,7 +25,7 @@ def test(label, buffer): if annotations: print('Annotations:') for a in annotations: - print(' * {} = {}'.format(a.key, a.val)) + print(' * {} = {}'.format(a.key, a.value)) print() diff --git a/contrib/laldoc/laldoc/__init__.py b/contrib/laldoc/laldoc/__init__.py index d412ee91c..962232e68 100755 --- a/contrib/laldoc/laldoc/__init__.py +++ b/contrib/laldoc/laldoc/__init__.py @@ -98,7 +98,7 @@ def get_documentation(self, decl): """ try: doc = decl.p_doc.splitlines() - annots = {a.key: self.decode_annotation(a.key, a.val) + annots = {a.key: self.decode_annotation(a.key, a.value) for a in decl.p_doc_annotations} except lal.PropertyError: self.warn('Badly formatted doc for {}'.format(decl.entity_repr))