Move the generic code under a top-level c_analyzer package.

python · ericsnowcurrently · Oct 19, 2019 · Sep 27, 2019 · Sep 27, 2019 · Sep 27, 2019
commit 653101411c8cdcc294b038e606d6bcdd4f1e4cba
diff --git a/Lib/test/test_tools/test_c_analyzer/test_c_globals/test___main__.py b/Lib/test/test_tools/test_c_analyzer/test_c_globals/test___main__.py
@@ -3,8 +3,8 @@
 
 from .. import tool_imports_for_tests
 with tool_imports_for_tests():
-    from c_analyzer_common import SOURCE_DIRS, info
-    from c_analyzer_common.known import DATA_FILE as KNOWN_FILE
+    from c_analyzer.common import SOURCE_DIRS, info
+    from c_analyzer.common.known import DATA_FILE as KNOWN_FILE
     import c_globals as cg
     from c_globals.supported import IGNORED_FILE
     from c_globals.__main__ import cmd_check, cmd_show, parse_args, main

diff --git a/Lib/test/test_tools/test_c_analyzer/test_c_globals/test_supported.py b/Lib/test/test_tools/test_c_analyzer/test_c_globals/test_supported.py
@@ -4,7 +4,7 @@
 
 from .. import tool_imports_for_tests
 with tool_imports_for_tests():
-    from c_analyzer_common.info import ID, Variable
+    from c_analyzer.common.info import ID, Variable
     from c_globals.supported import is_supported, ignored_from_file
 
 

diff --git a/...alyzer/test_c_analyzer_common/__init__.py → ...s/test_c_analyzer/test_common/__init__.py b/...alyzer/test_c_analyzer_common/__init__.py → ...s/test_c_analyzer/test_common/__init__.py
diff --git a/...yzer/test_c_analyzer_common/test_files.py → ...test_c_analyzer/test_common/test_files.py b/...yzer/test_c_analyzer_common/test_files.py → ...test_c_analyzer/test_common/test_files.py
@@ -3,7 +3,7 @@
 
 from .. import tool_imports_for_tests
 with tool_imports_for_tests():
-    from c_analyzer_common.files import (
+    from c_analyzer.common.files import (
             iter_files, _walk_tree, glob_tree,
             )
 

diff --git a/...lyzer/test_c_analyzer_common/test_find.py → .../test_c_analyzer/test_common/test_find.py b/...lyzer/test_c_analyzer_common/test_find.py → .../test_c_analyzer/test_common/test_find.py
@@ -2,8 +2,8 @@
 
 from .. import tool_imports_for_tests
 with tool_imports_for_tests():
-    from c_analyzer_common import info
-    from c_analyzer_common.find import vars_from_binary
+    from c_analyzer.common import info
+    from c_analyzer.common.find import vars_from_binary
 
 
 class _Base(unittest.TestCase):

diff --git a/...lyzer/test_c_analyzer_common/test_info.py → .../test_c_analyzer/test_common/test_info.py b/...lyzer/test_c_analyzer_common/test_info.py → .../test_c_analyzer/test_common/test_info.py
@@ -4,7 +4,7 @@
 from ..util import PseudoStr, StrProxy, Object
 from .. import tool_imports_for_tests
 with tool_imports_for_tests():
-    from c_analyzer_common.info import (
+    from c_analyzer.common.info import (
             UNKNOWN,
             ID,
             normalize_vartype, Variable

diff --git a/...yzer/test_c_analyzer_common/test_known.py → ...test_c_analyzer/test_common/test_known.py b/...yzer/test_c_analyzer_common/test_known.py → ...test_c_analyzer/test_common/test_known.py
@@ -4,8 +4,8 @@
 
 from .. import tool_imports_for_tests
 with tool_imports_for_tests():
-    from c_analyzer_common.info import ID, Variable
-    from c_analyzer_common.known import from_file
+    from c_analyzer.common.info import Variable
+    from c_analyzer.common.known import from_file
 
 
 class FromFileTests(unittest.TestCase):

diff --git a/...lyzer/test_c_analyzer_common/test_show.py → .../test_c_analyzer/test_common/test_show.py b/...lyzer/test_c_analyzer_common/test_show.py → .../test_c_analyzer/test_common/test_show.py
@@ -2,8 +2,8 @@
 
 from .. import tool_imports_for_tests
 with tool_imports_for_tests():
-    from c_analyzer_common import info
-    from c_analyzer_common.show import basic
+    from c_analyzer.common import info
+    from c_analyzer.common.show import basic
 
 
 TYPICAL = [

diff --git a/...test_c_analyzer/test_c_parser/__init__.py → ...s/test_c_analyzer/test_parser/__init__.py b/...test_c_analyzer/test_c_parser/__init__.py → ...s/test_c_analyzer/test_parser/__init__.py
diff --git a/...alyzer/test_c_parser/test_declarations.py → ...analyzer/test_parser/test_declarations.py b/...alyzer/test_c_parser/test_declarations.py → ...analyzer/test_parser/test_declarations.py
@@ -3,7 +3,7 @@
 
 from .. import tool_imports_for_tests
 with tool_imports_for_tests():
-    from c_parser.declarations import (
+    from c_analyzer.parser.declarations import (
         iter_global_declarations, iter_local_statements,
         parse_func, _parse_var, parse_compound,
         iter_variables,

diff --git a/...alyzer/test_c_parser/test_preprocessor.py → ...analyzer/test_parser/test_preprocessor.py b/...alyzer/test_c_parser/test_preprocessor.py → ...analyzer/test_parser/test_preprocessor.py
@@ -6,7 +6,7 @@
 from ..util import wrapped_arg_combos, StrProxy
 from .. import tool_imports_for_tests
 with tool_imports_for_tests():
-    from c_parser.preprocessor import (
+    from c_analyzer.parser.preprocessor import (
         iter_lines,
         # directives
         parse_directive, PreprocessorDirective,

diff --git a/...est_c_analyzer/test_c_symbols/__init__.py → .../test_c_analyzer/test_symbols/__init__.py b/...est_c_analyzer/test_c_symbols/__init__.py → .../test_c_analyzer/test_symbols/__init__.py
diff --git a/...st_c_analyzer/test_c_symbols/test_info.py → ...test_c_analyzer/test_symbols/test_info.py b/...st_c_analyzer/test_c_symbols/test_info.py → ...test_c_analyzer/test_symbols/test_info.py
@@ -4,8 +4,8 @@
 from ..util import PseudoStr, StrProxy, Object
 from .. import tool_imports_for_tests
 with tool_imports_for_tests():
-    from c_analyzer_common.info import ID
-    from c_symbols.info import Symbol
+    from c_analyzer.common.info import ID
+    from c_analyzer.symbols.info import Symbol
 
 
 class SymbolTests(unittest.TestCase):

diff --git a/Tools/c-analyzer/c_parser/__init__.py → Tools/c-analyzer/c_analyzer/__init__.py b/Tools/c-analyzer/c_parser/__init__.py → Tools/c-analyzer/c_analyzer/__init__.py
diff --git a/.../c-analyzer/c_analyzer_common/__init__.py → .../c-analyzer/c_analyzer/common/__init__.py b/.../c-analyzer/c_analyzer_common/__init__.py → .../c-analyzer/c_analyzer/common/__init__.py
@@ -2,10 +2,14 @@
 import sys
 
 
-PKG_ROOT = os.path.dirname(__file__)
-DATA_DIR = os.path.dirname(PKG_ROOT)
-REPO_ROOT = os.path.dirname(
-        os.path.dirname(DATA_DIR))
+TOOL_ROOT = (
+        os.path.dirname(  # c-analyzer/
+            os.path.dirname(  # c_analyzer/
+                os.path.dirname(__file__))))  # common/
+DATA_DIR = TOOL_ROOT
+REPO_ROOT = (
+        os.path.dirname(  # ..
+            os.path.dirname(TOOL_ROOT)))  # Tools/
 
 SOURCE_DIRS = [os.path.join(REPO_ROOT, name) for name in [
         'Include',

diff --git a/...c-analyzer/c_analyzer_common/_generate.py → ...c-analyzer/c_analyzer/common/_generate.py b/...c-analyzer/c_analyzer_common/_generate.py → ...c-analyzer/c_analyzer/common/_generate.py
diff --git a/Tools/c-analyzer/c_analyzer_common/files.py → Tools/c-analyzer/c_analyzer/common/files.py b/Tools/c-analyzer/c_analyzer_common/files.py → Tools/c-analyzer/c_analyzer/common/files.py
diff --git a/Tools/c-analyzer/c_analyzer_common/find.py → Tools/c-analyzer/c_analyzer/common/find.py b/Tools/c-analyzer/c_analyzer_common/find.py → Tools/c-analyzer/c_analyzer/common/find.py
@@ -1,12 +1,12 @@
-from c_analyzer_common import SOURCE_DIRS, PYTHON, files
-from c_analyzer_common.info import UNKNOWN, Variable
-from c_symbols import (
+from ..common import SOURCE_DIRS, PYTHON, files
+from ..common.info import UNKNOWN, Variable
+from ..parser import (
+        find as p_find,
+        )
+from ..symbols import (
         info as s_info,
         find as s_find,
         )
-from c_parser import (
-        find as p_find,
-        )
 
 # XXX need tests:
 # * vars_from_source

diff --git a/Tools/c-analyzer/c_analyzer_common/info.py → Tools/c-analyzer/c_analyzer/common/info.py b/Tools/c-analyzer/c_analyzer_common/info.py → Tools/c-analyzer/c_analyzer/common/info.py
@@ -170,7 +170,7 @@ class Variable(_NTBase,
     @classonly
     def from_parts(cls, filename, funcname, name, decl, storage=None):
         if storage is None:
-            from c_parser.declarations import extract_storage
+            from ..parser.declarations import extract_storage
             storage = extract_storage(decl, infunc=funcname)
         id = ID(filename, funcname, name)
         self = cls(id, storage, decl)

diff --git a/Tools/c-analyzer/c_analyzer_common/known.py → Tools/c-analyzer/c_analyzer/common/known.py b/Tools/c-analyzer/c_analyzer_common/known.py → Tools/c-analyzer/c_analyzer/common/known.py
diff --git a/Tools/c-analyzer/c_analyzer_common/show.py → Tools/c-analyzer/c_analyzer/common/show.py b/Tools/c-analyzer/c_analyzer_common/show.py → Tools/c-analyzer/c_analyzer/common/show.py
diff --git a/Tools/c-analyzer/c_analyzer_common/util.py → Tools/c-analyzer/c_analyzer/common/util.py b/Tools/c-analyzer/c_analyzer_common/util.py → Tools/c-analyzer/c_analyzer/common/util.py
diff --git a/Tools/c-analyzer/c_symbols/__init__.py → .../c-analyzer/c_analyzer/parser/__init__.py b/Tools/c-analyzer/c_symbols/__init__.py → .../c-analyzer/c_analyzer/parser/__init__.py
diff --git a/Tools/c-analyzer/c_parser/declarations.py → ...nalyzer/c_analyzer/parser/declarations.py b/Tools/c-analyzer/c_parser/declarations.py → ...nalyzer/c_analyzer/parser/declarations.py
@@ -2,7 +2,7 @@
 import shlex
 import subprocess
 
-from c_analyzer_common.info import UNKNOWN
+from ..common.info import UNKNOWN
 
 from . import source
 
@@ -196,6 +196,27 @@ def parse_func(stmt, body):
     return name, signature
 
 
+#TYPE_SPEC = rf'''(?:
+#        )'''
+#VAR_DECLARATOR = rf'''(?:
+#        )'''
+#VAR_DECL = rf'''(?:
+#            {TYPE_SPEC}+
+#            {VAR_DECLARATOR}
+#            \s*
+#        )'''
+#VAR_DECLARATION = rf'''(?:
+#            {VAR_DECL}
+#            (?: = [^=] [^;]* )?
+#            ;
+#        )'''
+#
+#
+#def parse_variable(decl, *, inFunc=False):
+#    """Return [(name, storage, vartype)] for the given variable declaration."""
+#    ...
+
+
 def _parse_var(stmt):
     """Return (name, vartype) for the given variable declaration."""
     stmt = stmt.rstrip(';')

diff --git a/Tools/c-analyzer/c_parser/find.py → Tools/c-analyzer/c_analyzer/parser/find.py b/Tools/c-analyzer/c_parser/find.py → Tools/c-analyzer/c_analyzer/parser/find.py
@@ -1,4 +1,4 @@
-from c_analyzer_common.info import Variable, UNKNOWN
+from ..common.info import Variable, UNKNOWN
 
 from . import declarations
 

diff --git a/Tools/c-analyzer/c_parser/naive.py → Tools/c-analyzer/c_analyzer/parser/naive.py b/Tools/c-analyzer/c_parser/naive.py → Tools/c-analyzer/c_analyzer/parser/naive.py
@@ -1,6 +1,6 @@
 import re
 
-from c_analyzer_common.info import UNKNOWN, Variable
+from ..common.info import UNKNOWN, Variable
 
 from .preprocessor import _iter_clean_lines
 

diff --git a/Tools/c-analyzer/c_parser/preprocessor.py → ...nalyzer/c_analyzer/parser/preprocessor.py b/Tools/c-analyzer/c_parser/preprocessor.py → ...nalyzer/c_analyzer/parser/preprocessor.py
@@ -3,7 +3,7 @@
 import os
 import re
 
-from c_analyzer_common import util, info
+from ..common import util, info
 
 
 CONTINUATION = '\\' + os.linesep

diff --git a/Tools/c-analyzer/c_parser/source.py → Tools/c-analyzer/c_analyzer/parser/source.py b/Tools/c-analyzer/c_parser/source.py → Tools/c-analyzer/c_analyzer/parser/source.py
diff --git a/Tools/c-analyzer/c_analyzer/symbols/__init__.py b/Tools/c-analyzer/c_analyzer/symbols/__init__.py
diff --git a/Tools/c-analyzer/c_symbols/_nm.py → Tools/c-analyzer/c_analyzer/symbols/_nm.py b/Tools/c-analyzer/c_symbols/_nm.py → Tools/c-analyzer/c_analyzer/symbols/_nm.py
@@ -1,7 +1,7 @@
 import os.path
 import shutil
 
-from c_analyzer_common import util, info
+from c_analyzer.common import util, info
 
 from .info import Symbol
 

diff --git a/Tools/c-analyzer/c_symbols/find.py → Tools/c-analyzer/c_analyzer/symbols/find.py b/Tools/c-analyzer/c_symbols/find.py → Tools/c-analyzer/c_analyzer/symbols/find.py
@@ -2,9 +2,9 @@
 import os.path
 import shutil
 
-from c_analyzer_common import PYTHON, known, files
-from c_analyzer_common.info import UNKNOWN, Variable
-from c_parser import find as p_find
+from ..common import PYTHON, known, files
+from ..common.info import UNKNOWN, Variable
+from ..parser import find as p_find
 
 from . import _nm
 from .info import Symbol

diff --git a/Tools/c-analyzer/c_symbols/info.py → Tools/c-analyzer/c_analyzer/symbols/info.py b/Tools/c-analyzer/c_symbols/info.py → Tools/c-analyzer/c_analyzer/symbols/info.py
@@ -1,7 +1,7 @@
 from collections import namedtuple
 
-from c_analyzer_common.info import ID
-from c_analyzer_common.util import classonly, _NTBase
+from c_analyzer.common.info import ID
+from c_analyzer.common.util import classonly, _NTBase
 
 
 class Symbol(_NTBase, namedtuple('Symbol', 'id kind external')):

diff --git a/Tools/c-analyzer/c_globals/__main__.py b/Tools/c-analyzer/c_globals/__main__.py
@@ -3,13 +3,14 @@
 import re
 import sys
 
-from c_analyzer_common import SOURCE_DIRS, REPO_ROOT, show
-from c_analyzer_common.find import vars_from_binary
-from c_analyzer_common.info import UNKNOWN
-from c_analyzer_common.known import (
+from c_analyzer.common import SOURCE_DIRS, REPO_ROOT, show
+from c_analyzer.common.find import vars_from_binary
+from c_analyzer.common.info import UNKNOWN
+from c_analyzer.common.known import (
     from_file as known_from_file,
     DATA_FILE as KNOWN_FILE,
     )
+
 from .supported import is_supported, ignored_from_file, IGNORED_FILE, _is_object
 
 

diff --git a/Tools/c-analyzer/c_globals/supported.py b/Tools/c-analyzer/c_globals/supported.py
@@ -1,9 +1,12 @@
 import os.path
 import re
 
-from c_analyzer_common import DATA_DIR
-from c_analyzer_common.info import ID
-from c_analyzer_common.util import read_tsv, write_tsv
+from c_analyzer.common import DATA_DIR
+from c_analyzer.common.info import ID
+from c_analyzer.common.util import read_tsv, write_tsv
+
+# XXX need tests:
+# * generate / script
 
 
 IGNORED_FILE = os.path.join(DATA_DIR, 'ignored.tsv')
@@ -379,11 +382,12 @@ def _generate_ignored_file(variables, filename=None, *,
 
 
 if __name__ == '__main__':
-    from c_analyzer_common import SOURCE_DIRS
-    from c_analyzer_common.known import (
+    from c_analyzer.common import SOURCE_DIRS
+    from c_analyzer.common.known import (
         from_file as known_from_file,
         DATA_FILE as KNOWN_FILE,
         )
+    # XXX This is wrong!
     from . import find
     known = known_from_file(KNOWN_FILE)
     knownvars = (known or {}).get('variables')