Skip to content

H
Hdlmake
Commit 78bbf20a authored by William Kamp's avatar William Kamp
Browse files
Options

Inherit extra_context (variables) from Parent Manifest.py, not just the top_module manifest.

parent 59ad6073
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
hdlmake/module/module.py
View file @ 78bbf20a
...@@ -158,7 +158,7 @@ PARSE START: %s ...@@ -158,7 +158,7 @@ PARSE START: %s
if self.parent is None: if self.parent is None:
extra_context = {} extra_context = {}
else: else:
extra_context = dict(self.top_module.manifest_dict) extra_context = dict(self.parent.manifest_dict)
extra_context["__manifest"] = self.path extra_context["__manifest"] = self.path
# The parse method is where most of the parser action takes place! # The parse method is where most of the parser action takes place!
...@@ -170,7 +170,8 @@ PARSE START: %s ...@@ -170,7 +170,8 @@ PARSE START: %s
"Error while parsing {0}:\n{1}: {2}.".format( "Error while parsing {0}:\n{1}: {2}.".format(
self.path, type(name_error), name_error)) self.path, type(name_error), name_error))
quit() quit()
self.manifest_dict = opt_map self.manifest_dict = extra_context
self.manifest_dict.update(opt_map)
else: else:
self.manifest_dict = {} self.manifest_dict = {}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment