Skip to content

Issue#6 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Issue#6 #7

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aa3f4e9
Add files via upload
abousquet Mar 8, 2018
25354bb
Add files via upload
abousquet Mar 8, 2018
1f6236e
Update parser.py
abousquet Mar 8, 2018
45488b8
Delete parser.py
abousquet Mar 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions idl_parser/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def parse(self, idls=[], idl_dirs=[], except_files=[]):
:param except_files: List of IDL files that should be ignored. Do not have to use fullpath.
:returns: None
"""
if self._verbose:
if self._verbose:
logger.write('parse(\n')
logger.write(' idls=%s\n' % idls)
logger.indent()
Expand All @@ -87,7 +87,7 @@ def parse(self, idls=[], idl_dirs=[], except_files=[]):

def parse_idl(self, idl_path):
if idl_path in self._parsed_files:
if self._verbose:
if self._verbose:
logger.write('Parsing IDL(%s) but ALREADY PARSED.\n' % idl_path)
return
pass
Expand All @@ -101,12 +101,12 @@ def parse_idl(self, idl_path):
lines.append((line_number, idl_path, line))
line_number = line_number + 1

self._parsed_files.append(idl_path)
self.parse_lines(lines)

if self._verbose:
logger.deindent()
logger.write('Parsed IDL (%s)\n' % idl_path)
self._parsed_files.append(idl_path)
logger.write('Parsed IDL (%s)\n' % idl_path)

def parse_lines(self, lines, filepath=None):
lines = self._clear_comments(lines)
Expand Down Expand Up @@ -201,6 +201,9 @@ def _include_paste(filepath):

if line.find('"') >= 7:
filename = line[line.find('"')+1 : line.rfind('"')]
if filename in self._parsed_files:
if self._verbose: logger.write("Skipping already included file %s\n" % filename)
continue
if self._verbose: logger.write('Find Includes %s\n' % filename)
p = self._find_idl(filename, _include_paste)
if p is None:
Expand All @@ -222,6 +225,9 @@ def _include_paste(filepath):

elif line.find('<') >= 7:
filename = line[line.find('<')+1 : line.rfind('>')]
if filename in self._parsed_files:
if self._verbose: logger.write("Skipping already included file %s\n" % filename)
continue
if self._verbose: sys.stdout.write(' -- Includes %s\n' % filename)
p = self._find_idl(filename, _include_paste)
if p is None:
Expand Down