added fix/hack for curses.h fails

Author: dg-pb

Tools/c-analyzer/c_parser/preprocessor/clang.py

@@ -47,42 +47,10 @@ def preprocess(filename,
     return _iter_lines(text, filename, samefiles, cwd)
 
 
-# Reasons:
-#   py_curses related have a stack return in unusual order for /include/curses.h
-CLANG_IGNORES = (
-    '/Include/py_curses.h',
-    '/Modules/_cursesmodule.c',
-    '/Modules/_curses_panel.c'
-)
-
-EXPERIMENTAL_PRINTED = False
-
-CLANG_EXPERIMENTAL = """
-
-WARNING
-=======
-clang preprocessor is in experimental state.
-a) There might be false positives
-b) Following files are skipped
-{}
-
-""".format('\n'.join(['    ' + fn for fn in CLANG_IGNORES]))
-
-
 EXIT_MARKERS = {'# 2 "<built-in>" 2', '# 3 "<built-in>" 2', '# 4 "<built-in>" 2'}
 
 
 def _iter_lines(text, reqfile, samefiles, cwd, raw=False):
-    global EXPERIMENTAL_PRINTED
-    if not EXPERIMENTAL_PRINTED:
-        print(CLANG_EXPERIMENTAL, flush=True)
-        EXPERIMENTAL_PRINTED = True
-
-    # NOTE:clang specific
-    if reqfile.endswith(CLANG_IGNORES):
-        print(f'\nSkipping: {reqfile}', flush=True)
-        return
-
     lines = iter(text.splitlines())
 
     # The first line is special.

Tools/c-analyzer/c_parser/preprocessor/gcc.py

@@ -102,6 +102,8 @@ def preprocess(filename,
 
 
 def _iter_lines(text, reqfile, samefiles, cwd, raw=False):
+    with open('/Users/Edu/Downloads/test.c', 'r') as f:
+        text = f.read()
     lines = iter(text.splitlines())
 
     # The first line is special.
@@ -163,6 +165,14 @@ def _iter_top_include_lines(lines, topfile, cwd,
 
         _lno, included, flags = _parse_marker_line(line)
         if included:
+            # HACK:
+            # Mixes curses.h and ncurses.h marker lines
+            # gcc silently passes this, while clang fails
+            # See: /Include/py_curses.h #if-elif directives
+            # And compare with preprocessor output
+            if os.path.basename(included) == 'curses.h':
+                included = os.path.join(os.path.dirname(included), 'ncurses.h')
+
             lno = _lno
             included = _normpath(included, cwd)
             # We hit a marker line.