Skip to content

H
Hdlmake
Commit f7cfce26 authored by Tristan Gingold's avatar Tristan Gingold
Browse files
Options

dep_file.py: split add_relation to add_depend/add_require

parent fad48533
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 16 deletions
hdlmake/sourcefiles/dep_file.py
View file @ f7cfce26
...@@ -140,7 +140,8 @@ class File(object): ...@@ -140,7 +140,8 @@ class File(object):
class DepFile(File): class DepFile(File):
"""Class that serves as base to all those HDL files that can be """Class that serves as base to all those HDL files that can be
parsed and solved (Verilog, SystemVerilog, VHDL)""" parsed and solved (Verilog, SystemVerilog, VHDL). Inherit from
File but also provides dependencies"""
def __init__(self, path, module): def __init__(self, path, module):
assert isinstance(path, six.string_types) assert isinstance(path, six.string_types)
...@@ -150,8 +151,14 @@ class DepFile(File): ...@@ -150,8 +151,14 @@ class DepFile(File):
self.dep_level = None self.dep_level = None
self.is_parsed = False self.is_parsed = False
def add_relation(self, rel): def add_require(self, rel):
"""Add a new relation to the set provided by the file""" """Add dependency :param rel:"""
assert rel.direction == DepRelation.USE
self.rels.add(rel)
def add_provide(self, rel):
"""Add provide :param rel:"""
assert rel.direction == DepRelation.PROVIDE
self.rels.add(rel) self.rels.add(rel)
def satisfies(self, rel_b): def satisfies(self, rel_b):
......
hdlmake/sourcefiles/vhdl_parser.py
View file @ f7cfce26
...@@ -69,14 +69,14 @@ class VHDLParser(DepParser): ...@@ -69,14 +69,14 @@ class VHDLParser(DepParser):
if text.group(1).lower() == "work": if text.group(1).lower() == "work":
logging.debug("use package %s.%s", logging.debug("use package %s.%s",
dep_file.library, text.group(2)) dep_file.library, text.group(2))
dep_file.add_relation( dep_file.add_require(
DepRelation("%s.%s" % (dep_file.library, text.group(2)), DepRelation("%s.%s" % (dep_file.library, text.group(2)),
DepRelation.USE, DepRelation.USE,
DepRelation.PACKAGE)) DepRelation.PACKAGE))
else: else:
logging.debug("use package %s.%s", logging.debug("use package %s.%s",
text.group(1), text.group(2)) text.group(1), text.group(2))
dep_file.add_relation( dep_file.add_require(
DepRelation("%s.%s" % (text.group(1), text.group(2)), DepRelation("%s.%s" % (text.group(1), text.group(2)),
DepRelation.USE, DepRelation.USE,
DepRelation.PACKAGE)) DepRelation.PACKAGE))
...@@ -95,7 +95,7 @@ class VHDLParser(DepParser): ...@@ -95,7 +95,7 @@ class VHDLParser(DepParser):
to the file""" to the file"""
logging.debug("found entity %s.%s", logging.debug("found entity %s.%s",
dep_file.library, text.group(1)) dep_file.library, text.group(1))
dep_file.add_relation( dep_file.add_provide(
DepRelation("%s.%s" % (dep_file.library, text.group(1)), DepRelation("%s.%s" % (dep_file.library, text.group(1)),
DepRelation.PROVIDE, DepRelation.PROVIDE,
DepRelation.ENTITY)) DepRelation.ENTITY))
...@@ -116,11 +116,11 @@ class VHDLParser(DepParser): ...@@ -116,11 +116,11 @@ class VHDLParser(DepParser):
relations to the file""" relations to the file"""
logging.debug("found architecture %s of entity %s.%s", logging.debug("found architecture %s of entity %s.%s",
text.group(1), dep_file.library, text.group(2)) text.group(1), dep_file.library, text.group(2))
dep_file.add_relation( dep_file.add_provide(
DepRelation("%s.%s" % (dep_file.library, text.group(2)), DepRelation("%s.%s" % (dep_file.library, text.group(2)),
DepRelation.PROVIDE, DepRelation.PROVIDE,
DepRelation.ARCHITECTURE)) DepRelation.ARCHITECTURE))
dep_file.add_relation( dep_file.add_require(
DepRelation("%s.%s" % (dep_file.library, text.group(2)), DepRelation("%s.%s" % (dep_file.library, text.group(2)),
DepRelation.USE, DepRelation.USE,
DepRelation.ENTITY)) DepRelation.ENTITY))
...@@ -141,7 +141,7 @@ class VHDLParser(DepParser): ...@@ -141,7 +141,7 @@ class VHDLParser(DepParser):
relations to the file""" relations to the file"""
logging.debug("found package %s.%s", dep_file.library, logging.debug("found package %s.%s", dep_file.library,
text.group(1)) text.group(1))
dep_file.add_relation( dep_file.add_provide(
DepRelation("%s.%s" % (dep_file.library, text.group(1)), DepRelation("%s.%s" % (dep_file.library, text.group(1)),
DepRelation.PROVIDE, DepRelation.PROVIDE,
DepRelation.PACKAGE)) DepRelation.PACKAGE))
...@@ -252,7 +252,7 @@ class VHDLParser(DepParser): ...@@ -252,7 +252,7 @@ class VHDLParser(DepParser):
lib = text.group("LIB") lib = text.group("LIB")
if not lib or lib == "work": if not lib or lib == "work":
lib = dep_file.library lib = dep_file.library
dep_file.add_relation(DepRelation( dep_file.add_require(DepRelation(
"%s.%s" % (lib, text.group("ENTITY")), "%s.%s" % (lib, text.group("ENTITY")),
DepRelation.USE, DepRelation.ENTITY)) DepRelation.USE, DepRelation.ENTITY))
return "<hdlmake instance %s|%s|%s>" % (text.group("LABEL"), return "<hdlmake instance %s|%s|%s>" % (text.group("LABEL"),
......
hdlmake/sourcefiles/vlog_parser.py
View file @ f7cfce26
...@@ -528,7 +528,7 @@ class VerilogParser(DepParser): ...@@ -528,7 +528,7 @@ class VerilogParser(DepParser):
relations to the file""" relations to the file"""
logging.debug("file %s imports/uses %s.%s package", logging.debug("file %s imports/uses %s.%s package",
dep_file.path, dep_file.library, text.group(1)) dep_file.path, dep_file.library, text.group(1))
dep_file.add_relation( dep_file.add_require(
DepRelation("%s.%s" % (dep_file.library, text.group(1)), DepRelation("%s.%s" % (dep_file.library, text.group(1)),
DepRelation.USE, DepRelation.PACKAGE)) DepRelation.USE, DepRelation.PACKAGE))
import_pattern.subn(do_imports, buf) import_pattern.subn(do_imports, buf)
...@@ -544,7 +544,7 @@ class VerilogParser(DepParser): ...@@ -544,7 +544,7 @@ class VerilogParser(DepParser):
relations to the file""" relations to the file"""
logging.debug("found pacakge %s.%s", dep_file.library, logging.debug("found pacakge %s.%s", dep_file.library,
text.group(1)) text.group(1))
dep_file.add_relation( dep_file.add_provide(
DepRelation("%s.%s" % (dep_file.library, text.group(1)), DepRelation("%s.%s" % (dep_file.library, text.group(1)),
DepRelation.PROVIDE, DepRelation.PACKAGE)) DepRelation.PROVIDE, DepRelation.PACKAGE))
m_inside_package.subn(do_package, buf) m_inside_package.subn(do_package, buf)
...@@ -568,7 +568,7 @@ class VerilogParser(DepParser): ...@@ -568,7 +568,7 @@ class VerilogParser(DepParser):
PROVIDE relations to the file""" PROVIDE relations to the file"""
logging.debug("found module %s.%s", dep_file.library, logging.debug("found module %s.%s", dep_file.library,
text.group(1)) text.group(1))
dep_file.add_relation( dep_file.add_provide(
DepRelation("%s.%s" % (dep_file.library, text.group(1)), DepRelation("%s.%s" % (dep_file.library, text.group(1)),
DepRelation.PROVIDE, DepRelation.MODULE)) DepRelation.PROVIDE, DepRelation.MODULE))
...@@ -582,7 +582,7 @@ class VerilogParser(DepParser): ...@@ -582,7 +582,7 @@ class VerilogParser(DepParser):
return return
logging.debug("-> instantiates %s.%s as %s", logging.debug("-> instantiates %s.%s as %s",
dep_file.library, text.group(1), text.group(2)) dep_file.library, text.group(1), text.group(2))
dep_file.add_relation( dep_file.add_require(
DepRelation("%s.%s" % (dep_file.library, text.group(1)), DepRelation("%s.%s" % (dep_file.library, text.group(1)),
DepRelation.USE, DepRelation.MODULE)) DepRelation.USE, DepRelation.MODULE))
for stmt in [x for x in m_stmt.split(text.group(2)) if x and x[-1] == ")"]: for stmt in [x for x in m_stmt.split(text.group(2)) if x and x[-1] == ")"]:
...@@ -590,7 +590,7 @@ class VerilogParser(DepParser): ...@@ -590,7 +590,7 @@ class VerilogParser(DepParser):
if match: if match:
do_inst(match) do_inst(match)
m_inside_module.subn(do_module, buf) m_inside_module.subn(do_module, buf)
dep_file.add_relation( dep_file.add_provide(
DepRelation( DepRelation(
dep_file.path, dep_file.path,
DepRelation.PROVIDE, DepRelation.PROVIDE,
......
hdlmake/sourcefiles/xci_parser.py
View file @ f7cfce26
...@@ -51,7 +51,7 @@ class XCIParser(DepParser): ...@@ -51,7 +51,7 @@ class XCIParser(DepParser):
if not value is None: if not value is None:
modulename = value.text modulename = value.text
logging.debug("found module %s.%s", dep_file.library, modulename) logging.debug("found module %s.%s", dep_file.library, modulename)
dep_file.add_relation( dep_file.add_provide(
DepRelation("%s.%s" % (dep_file.library, modulename), DepRelation("%s.%s" % (dep_file.library, modulename),
DepRelation.PROVIDE, DepRelation.MODULE)) DepRelation.PROVIDE, DepRelation.MODULE))
......
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