Oct 23, 2020 · Oct 20, 2020 · Oct 20, 2020 · Oct 22, 2020 · Oct 23, 2020 · Oct 23, 2020
diff --git a/Tools/c-analyzer/c_analyzer/__main__.py b/Tools/c-analyzer/c_analyzer/__main__.py
            print(f'{failure!r} {data!r}')
    elif fmt == 'brief':
        def handle_failure(failure, data):
            print(f'{data.filename}\t{data.parent or "-"}\t{data.name}\t{failure!r}')
            parent = data.parent or ''
            funcname = parent if isinstance(parent, str) else parent.name
            name = f'({funcname}).{data.name}' if funcname else data.name
            failure = failure.split('\t')[0]
            print(f'{data.filename}:{name} - {failure}')
    elif fmt == 'summary':
        failures = []
        def handle_failure(failure, data):
            failures.append((failure, data))
        def handle_after():
            # XXX
            raise NotImplementedError
            parent = data.parent or ''
            funcname = parent if isinstance(parent, str) else parent.name
            print(f'{data.filename:35}\t{funcname or "-":35}\t{data.name:40}\t{failure}')
    elif fmt == 'full':
        div = ''
        def handle_failure(failure, data):
              checks=None,
              ignored=None,
              fmt=None,
              relroot=None,
              failfast=False,
              iter_filenames=None,
              verbosity=VERBOSITY,

    logger.info('analyzing...')
    analyzed = _analyze(filenames, **kwargs)
    if relroot:
        analyzed.fix_filenames(relroot)

    logger.info('checking...')
    numfailed = 0
diff --git a/Tools/c-analyzer/c_analyzer/info.py b/Tools/c-analyzer/c_analyzer/info.py
        else:
            return UNKNOWN not in self.typedecl

    def fix_filename(self, relroot):
        self.item.fix_filename(relroot)

    def as_rowdata(self, columns=None):
        # XXX finsih!
        return self.item.as_rowdata(columns)
        else:
            return self._analyzed[key]

    def fix_filenames(self, relroot):
        for item in self._analyzed:
            item.fix_filename(relroot)

    def _add_result(self, info, resolved):
        analyzed = type(self).build_item(info, resolved)
        self._analyzed[analyzed] = None
diff --git a/Tools/c-analyzer/c_parser/info.py b/Tools/c-analyzer/c_parser/info.py
 from collections import namedtuple
 import enum
 import os.path
 import re

 from c_common.clsutil import classonly
    def __str__(self):
        return self.filename

    def fix_filename(self, relroot):
        filename = os.path.relpath(self.filename, relroot)
        return self._replace(filename=filename)


 class SourceLine(namedtuple('Line', 'file kind data conditions')):
    KINDS = (
            )
            return self._parsed

    def fix_filename(self, relroot):
        if self.file:
            self.file = self.file.fix_filename(relroot)

    def as_rowdata(self, columns=None):
        columns, datacolumns, colnames = self._parse_columns(columns)
        return self._as_row(colnames, datacolumns, self._data_as_row)
diff --git a/Tools/c-analyzer/cpython/__main__.py b/Tools/c-analyzer/cpython/__main__.py
    kwargs['get_file_preprocessor'] = _parser.get_preprocessor(log_err=print)
    c_analyzer.cmd_check(
        filenames,
        relroot=REPO_ROOT,
        _analyze=_analyzer.analyze,
        _CHECKS=CHECKS,
        **kwargs
diff --git a/Tools/c-analyzer/cpython/_analyzer.py b/Tools/c-analyzer/cpython/_analyzer.py
            continue
        if item.id in ignored:
            continue
        yield item, 'not supported'
        reason = item.unsupported
        if not reason:
            reason = '???'
        elif not isinstance(reason, str):
            if len(reason) == 1:
                reason, = reason
        reason = f'({reason})'
        yield item, f'not supported {reason:20}\t{item.storage or ""} {item.vartype}'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -160,14 +160,16 @@ def handle_failure(failure, data):
		print(f'{failure!r} {data!r}')
		elif fmt == 'brief':
		def handle_failure(failure, data):
		print(f'{data.filename}\t{data.parent or "-"}\t{data.name}\t{failure!r}')
		parent = data.parent or ''
		funcname = parent if isinstance(parent, str) else parent.name
		name = f'({funcname}).{data.name}' if funcname else data.name
		failure = failure.split('\t')[0]
		print(f'{data.filename}:{name} - {failure}')
		elif fmt == 'summary':
		failures = []
		def handle_failure(failure, data):
		failures.append((failure, data))
		def handle_after():
		# XXX
		raise NotImplementedError
		parent = data.parent or ''
		funcname = parent if isinstance(parent, str) else parent.name
		print(f'{data.filename:35}\t{funcname or "-":35}\t{data.name:40}\t{failure}')
		elif fmt == 'full':
		div = ''
		def handle_failure(failure, data):
Expand DownExpand Up		@@ -283,6 +285,7 @@ def cmd_check(filenames, *,
		checks=None,
		ignored=None,
		fmt=None,
		relroot=None,
		failfast=False,
		iter_filenames=None,
		verbosity=VERBOSITY,
Expand All		@@ -304,6 +307,8 @@ def cmd_check(filenames, *,

		logger.info('analyzing...')
		analyzed = _analyze(filenames, **kwargs)
		if relroot:
		analyzed.fix_filenames(relroot)

		logger.info('checking...')
		numfailed = 0
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -257,6 +257,9 @@ def is_known(self):
		else:
		return UNKNOWN not in self.typedecl

		def fix_filename(self, relroot):
		self.item.fix_filename(relroot)

		def as_rowdata(self, columns=None):
		# XXX finsih!
		return self.item.as_rowdata(columns)
Expand DownExpand Up		@@ -340,6 +343,10 @@ def __getitem__(self, key):
		else:
		return self._analyzed[key]

		def fix_filenames(self, relroot):
		for item in self._analyzed:
		item.fix_filename(relroot)

		def _add_result(self, info, resolved):
		analyzed = type(self).build_item(info, resolved)
		self._analyzed[analyzed] = None
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,5 +1,6 @@
		from collections import namedtuple
		import enum
		import os.path
		import re

		from c_common.clsutil import classonly
Expand DownExpand Up		@@ -287,6 +288,10 @@ def from_raw(cls, raw):
		def __str__(self):
		return self.filename

		def fix_filename(self, relroot):
		filename = os.path.relpath(self.filename, relroot)
		return self._replace(filename=filename)


		class SourceLine(namedtuple('Line', 'file kind data conditions')):
		KINDS = (
Expand DownExpand Up		@@ -688,6 +693,10 @@ def parsed(self):
		)
		return self._parsed

		def fix_filename(self, relroot):
		if self.file:
		self.file = self.file.fix_filename(relroot)

		def as_rowdata(self, columns=None):
		columns, datacolumns, colnames = self._parse_columns(columns)
		return self._as_row(colnames, datacolumns, self._data_as_row)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -114,6 +114,7 @@ def cmd_check(filenames=None, **kwargs):
		kwargs['get_file_preprocessor'] = _parser.get_preprocessor(log_err=print)
		c_analyzer.cmd_check(
		filenames,
		relroot=REPO_ROOT,
		_analyze=_analyzer.analyze,
		_CHECKS=CHECKS,
		**kwargs
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -338,4 +338,11 @@ def check_globals(analysis):
		continue
		if item.id in ignored:
		continue
		yield item, 'not supported'
		reason = item.unsupported
		if not reason:
		reason = '???'
		elif not isinstance(reason, str):
		if len(reason) == 1:
		reason, = reason
		reason = f'({reason})'
		yield item, f'not supported {reason:20}\t{item.storage or ""} {item.vartype}'