diff options
Diffstat (limited to 'python/clidef.py')
| -rw-r--r-- | python/clidef.py | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/python/clidef.py b/python/clidef.py index a47cee2d6b..b57a00fc89 100644 --- a/python/clidef.py +++ b/python/clidef.py @@ -173,7 +173,7 @@ handlers = { # common form, without requiring a more advanced template engine (e.g. # jinja2) templ = Template( - """/* $fnname => "$cmddef" */ + """$cond_begin/* $fnname => "$cmddef" */ DEFUN_CMD_FUNC_DECL($fnname) #define funcdecl_$fnname static int ${fnname}_magic(\\ const struct cmd_element *self __attribute__ ((unused)),\\ @@ -211,7 +211,7 @@ $argblocks $argassert return ${fnname}_magic(self, vty, argc, argv$arglist); } - +$cond_end """ ) @@ -265,7 +265,25 @@ def process_file(fn, ofd, dumpfd, all_defun, macros): errors = 0 filedata = clippy.parse(fn) + cond_stack = [] + for entry in filedata["data"]: + if entry["type"] == "PREPROC": + line = entry["line"].lstrip() + tokens = line.split(maxsplit=1) + line = "#" + line + "\n" + + if not tokens: + continue + + if tokens[0] in ["if", "ifdef", "ifndef"]: + cond_stack.append(line) + elif tokens[0] in ["elif", "else"]: + prev_line = cond_stack.pop(-1) + cond_stack.append(prev_line + line) + elif tokens[0] in ["endif"]: + cond_stack.pop(-1) + continue if entry["type"].startswith("DEFPY") or ( all_defun and entry["type"].startswith("DEFUN") ): @@ -385,6 +403,8 @@ def process_file(fn, ofd, dumpfd, all_defun, macros): else: dumpfd.write('"%s":\n\t---- no magic arguments ----\n\n' % (cmddef)) + params["cond_begin"] = "".join(cond_stack) + params["cond_end"] = "".join(["#endif\n"] * len(cond_stack)) params["argdefs"] = "".join(argdefs) params["argdecls"] = "".join(argdecls) params["arglist"] = "".join(arglist) @@ -435,6 +455,8 @@ if __name__ == "__main__": macros.load(os.path.join(basepath, "bgpd/bgp_vty.h")) # sigh :( macros["PROTO_REDIST_STR"] = "FRR_REDIST_STR_ISISD" + macros["PROTO_IP_REDIST_STR"] = "FRR_IP_REDIST_STR_ISISD" + macros["PROTO_IP6_REDIST_STR"] = "FRR_IP6_REDIST_STR_ISISD" errors = process_file(args.cfile, ofd, dumpfd, args.all_defun, macros) if errors != 0: |