Skip to content

H
hdl-make
Commit 56d43c0c authored by Javier D. Garcia-Lasheras's avatar Javier D. Garcia-Lasheras
Browse files
Options

VHDL parser workaround: If we are not able to scan a package, use the full file as content

parent 0c1ae4bf
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 8 deletions
hdlmake/new_dep_solver.py
View file @ 56d43c0c
......@@ -213,6 +213,7 @@ def solve(fileset, top_entity):
sorted_components= nx.topological_sort(top_hierarchy)
print(sorted_components)
print("FILES:")
solved_files = []
for component in sorted_components:
......
hdlmake/vhdl_parser.py
View file @ 56d43c0c
......@@ -106,10 +106,7 @@ class VHDLParser(DepParser):
print('- architecture: %s(%s)' % (architecture[1], architecture[0]))
# Note: architecture closes with "end architecture" (we were missing this),
# "end <arch_name>" or "end architecture <arch_name>
#architecture_inner_pattern = re.compile("^\s*architecture\s%s\s+of\s%s\s+is(.*)end\s.*?%s.*?;" % (architecture[0], architecture[1], architecture[0]), re.DOTALL | re.MULTILINE | re.IGNORECASE )
architecture_inner_pattern = re.compile("^\s*architecture\s%s\s+of\s%s\s+is(.*)end\s+(%s|architecture\s%s|architecture).*?;" % (architecture[0], architecture[1], architecture[0], architecture[0]), re.DOTALL | re.MULTILINE | re.IGNORECASE )
#architecture_inner_pattern = re.compile("^\s*architecture\s%s\s+of\s%s\s+is(.*)end\s.*?^(%s|architecture\s).*?;" % (architecture[0], architecture[1], architecture[0]), re.DOTALL | re.MULTILINE | re.IGNORECASE )
#architecture_inner_pattern = re.compile("^\s*architecture\s%s\s+of\s%s\s+is(.*)end\s^(%s|architecture).*?;" % (architecture[0], architecture[1], architecture[0]), re.DOTALL | re.MULTILINE | re.IGNORECASE )
architecture_inner_content = architecture_inner_pattern.findall(buf)
print("********************** INNER CONTENT *********************************************")
print(architecture_inner_content)
......@@ -117,12 +114,17 @@ class VHDLParser(DepParser):
component_pattern = re.compile("^\s*component\s+(\w+).*?end\s+component.*?;", re.DOTALL | re.MULTILINE | re.IGNORECASE )
print("Architecture dependencies:")
print("content length: %s" % len(architecture_inner_content))
# if the inner content is none but the architecture exists, we will temporarly parse
# the full file -- a very wild guess
if len(architecture_inner_content) > 0:
architecture_aux.components = component_pattern.findall(architecture_inner_content[0][0])
instances_pattern = re.compile("^\s*(\w+)\s*\:\s*(\w+)\s*(?:port\s+map.*?;|generic\s+map.*?;|\s*;)", re.DOTALL | re.MULTILINE | re.IGNORECASE )
instance_from_library_pattern = re.compile("^\s*(\w+)\s*\:\s*entity\s*(\w+)\s*\.\s*(\w+)\s*(?:port\s+map.*?;|generic\s+map.*?;|\s*;)", re.DOTALL | re.MULTILINE | re.IGNORECASE )
architecture_aux.entities = instances_pattern.findall(architecture_inner_content[0][0])
architecture_aux.instances = instance_from_library_pattern.findall(architecture_inner_content[0][0])
architecture_string = architecture_inner_content[0][0]
else:
architecture_string = buf
architecture_aux.components = component_pattern.findall(architecture_string)
instances_pattern = re.compile("^\s*(\w+)\s*\:\s*(\w+)\s*(?:port\s+map.*?;|generic\s+map.*?;|\s*;)", re.DOTALL | re.MULTILINE | re.IGNORECASE )
instance_from_library_pattern = re.compile("^\s*(\w+)\s*\:\s*entity\s*(\w+)\s*\.\s*(\w+)\s*(?:port\s+map.*?;|generic\s+map.*?;|\s*;)", re.DOTALL | re.MULTILINE | re.IGNORECASE )
architecture_aux.entities = instances_pattern.findall(architecture_string)
architecture_aux.instances = instance_from_library_pattern.findall(architecture_string)
dep_file.provided_architectures.append(architecture_aux)
instance_from_library_pattern = re.compile("^\s*(\w+)\s*\:\s*entity\s*(\w+)\s*\.\s*(\w+)\s*(?:port\s+map.*?;|generic\s+map.*?;|\s*;)", re.DOTALL | re.MULTILINE | re.IGNORECASE )
print("**********************************************************************************")
......
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