Skip to content

H
Hdlmake
Commit 924fc3bc authored by Javier D. Garcia-Lasheras's avatar Javier D. Garcia-Lasheras
Browse files
Options

Move the HDL parser creator function from new_dep_solver to dep_file

parent f73ad884
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 29 deletions
hdlmake/dep_file.py
View file @ 924fc3bc
...@@ -50,7 +50,8 @@ class DepRelation(object): ...@@ -50,7 +50,8 @@ class DepRelation(object):
self.obj_name = obj_name.lower() self.obj_name = obj_name.lower()
def satisfies(self, rel_b): def satisfies(self, rel_b):
if rel_b.direction == DepRelation.PROVIDE or self.direction == DepRelation.USE: if (rel_b.direction == DepRelation.PROVIDE or
self.direction == DepRelation.USE):
return False return False
if rel_b.rel_type == self.rel_type and rel_b.obj_name == self.obj_name: if rel_b.rel_type == self.rel_type and rel_b.obj_name == self.obj_name:
return True return True
...@@ -75,7 +76,9 @@ class DepRelation(object): ...@@ -75,7 +76,9 @@ class DepRelation(object):
self.INCLUDE: "include/header", self.INCLUDE: "include/header",
self.ARCHITECTURE: "architecture", self.ARCHITECTURE: "architecture",
self.MODULE: "module"} self.MODULE: "module"}
return "%s %s '%s'" % (dstr[self.direction], ostr[self.rel_type], self.obj_name) return "%s %s '%s'" % (dstr[self.direction],
ostr[self.rel_type],
self.obj_name)
def __hash__(self): def __hash__(self):
return hash(self.__repr__()) return hash(self.__repr__())
...@@ -142,7 +145,7 @@ class File(object): ...@@ -142,7 +145,7 @@ class File(object):
return os.path.isdir(self.path) return os.path.isdir(self.path)
def show(self): def show(self):
print(self.path) print self.path
def extension(self): def extension(self):
tmp = self.path.rsplit('.') tmp = self.path.rsplit('.')
...@@ -171,11 +174,27 @@ class DepFile(File): ...@@ -171,11 +174,27 @@ class DepFile(File):
self.include_paths = [] self.include_paths = []
def parse_if_needed(self): def parse_if_needed(self):
logging.debug("Parse %s if needed!!!" % self.file_path) """If the HDL file is not parsed yet, do it now!"""
import new_dep_solver def _create_parser(dep_file):
"""Function that returns the appropriated HDL parser for the
provided dep_file (VHDL or Verilog)"""
from .vlog_parser import VerilogParser
from .vhdl_parser import VHDLParser
if isinstance(dep_file, VHDLFile):
return VHDLParser(dep_file)
elif isinstance(dep_file, VerilogFile) or isinstance(dep_file, SVFile):
verilog_parser = VerilogParser(dep_file)
for dir_aux in dep_file.include_paths:
verilog_parser.add_search_path(dir_aux)
return verilog_parser
else:
raise ValueError("Unrecognized file format : %s" %
dep_file.file_path)
logging.debug("Parse %s if needed!!!", self.file_path)
import hdlmake.new_dep_solver
if not self.is_parsed: if not self.is_parsed:
logging.debug("Not parsed yet, let's go!") logging.debug("Not parsed yet, let's go!")
parser = new_dep_solver.create(self) parser = _create_parser(self)
parser.parse(self) parser.parse(self)
# use proxy template here # use proxy template here
...@@ -199,7 +218,7 @@ class DepFile(File): ...@@ -199,7 +218,7 @@ class DepFile(File):
def show_relations(self): def show_relations(self):
# self._parse_if_needed() # self._parse_if_needed()
for r in self.rels: for r in self.rels:
print(str(r)) print str(r)
@property @property
def filename(self): def filename(self):
...@@ -210,7 +229,8 @@ class DepFile(File): ...@@ -210,7 +229,8 @@ class DepFile(File):
if len(self.depends_on) == 0: if len(self.depends_on) == 0:
self.dep_level = 0 self.dep_level = 0
else: else:
# set dep_level to a negative value so we can detect if the recusion below brings us back to # set dep_level to a negative value so we can detect
# if the recusion below brings us back to
# this file in a circular reference, that would otherwise # this file in a circular reference, that would otherwise
# result in an infinite loop. # result in an infinite loop.
self.dep_level = -1 self.dep_level = -1
...@@ -218,7 +238,8 @@ class DepFile(File): ...@@ -218,7 +238,8 @@ class DepFile(File):
self.dep_level = 1 + \ self.dep_level = 1 + \
max([dep.get_dep_level() for dep in self.depends_on]) max([dep.get_dep_level() for dep in self.depends_on])
elif self.dep_level < 0: elif self.dep_level < 0:
logging.warning( logging.warning("Probably run into a circular reference of file "
"Probably run into a circular reference of file dependencies. It appears %s depends on itself, indirectly via atleast one other file." % "dependencies. It appears %s depends on itself, "
self.file_path) "indirectly via atleast one other file.",
self.file_path)
return self.dep_level return self.dep_level
hdlmake/new_dep_solver.py
View file @ 924fc3bc
...@@ -41,24 +41,6 @@ class DepParser(object): ...@@ -41,24 +41,6 @@ class DepParser(object):
"""Base dummy interface method for the HDL parse execution""" """Base dummy interface method for the HDL parse execution"""
raise raise
def create(dep_file):
"""Function that returns the appropriated HDL parser for the
provided dep_file (VHDL or Verilog)"""
from .vlog_parser import VerilogParser
from .vhdl_parser import VHDLParser
if isinstance(dep_file, VHDLFile):
return VHDLParser(dep_file)
elif isinstance(dep_file, VerilogFile) or isinstance(dep_file, SVFile):
verilog_parser = VerilogParser(dep_file)
for dir_aux in dep_file.include_paths:
verilog_parser.add_search_path(dir_aux)
return verilog_parser
else:
raise ValueError("Unrecognized file format : %s" %
dep_file.file_path)
def solve(fileset): def solve(fileset):
"""Function that Parses and Solves the provided HDL fileset. Note """Function that Parses and Solves the provided HDL fileset. Note
that it doesn't return a new fileset, but modifies the original one""" that it doesn't return a new fileset, but modifies the original one"""
......
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