summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOndrej Fabry <ofabry@cisco.com>2023-02-03 11:33:39 +0100
committerDave Wallace <dwallacelf@gmail.com>2023-02-03 18:02:22 +0000
commit390874b73b21f907789daca66c45fe12a83d4ab2 (patch)
treecf48a2fea7e2357db08e7ab470740f077c4fac93 /src
parent701ba9cfe3f724d3b57d6397756a571d8469fbdf (diff)
vppapigen: fix incorrect comments in json
Type: fix Signed-off-by: Ondrej Fabry <ofabry@cisco.com> Change-Id: I241cefbbce98cf6fef83f36bd87ae2c1f4b067f0 (cherry picked from commit a4f994f31e566cc5e6512d3aebf627a6e3ce2cc7)
Diffstat (limited to 'src')
-rwxr-xr-xsrc/tools/vppapigen/vppapigen.py2
-rw-r--r--src/tools/vppapigen/vppapigen_json.py3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/tools/vppapigen/vppapigen.py b/src/tools/vppapigen/vppapigen.py
index ce05cbe9b3f..2b0ce9999d7 100755
--- a/src/tools/vppapigen/vppapigen.py
+++ b/src/tools/vppapigen/vppapigen.py
@@ -752,6 +752,7 @@ class VPPAPIParser:
"""define : DEFINE ID '{' block_statements_opt '}' ';'"""
self.fields = []
p[0] = Define(p[2], [], p[4], self.last_comment)
+ self.last_comment = None
def p_define_flist(self, p):
"""define : flist DEFINE ID '{' block_statements_opt '}' ';'"""
@@ -763,6 +764,7 @@ class VPPAPIParser:
)
else:
p[0] = Define(p[3], p[1], p[5], self.last_comment)
+ self.last_comment = None
def p_flist(self, p):
"""flist : flag
diff --git a/src/tools/vppapigen/vppapigen_json.py b/src/tools/vppapigen/vppapigen_json.py
index ba32e284d81..0a1a3d37373 100644
--- a/src/tools/vppapigen/vppapigen_json.py
+++ b/src/tools/vppapigen/vppapigen_json.py
@@ -77,7 +77,8 @@ def walk_defs(s, is_message=False):
c = {}
c["crc"] = "{0:#0{1}x}".format(t.crc, 10)
c["options"] = t.options
- c["comment"] = t.comment
+ if t.comment:
+ c["comment"] = t.comment
d.append(c)
r.append(d)