Merge pull request #1314 from well-typed/dom/1155/duplicate-declarations

Do not panic on duplicate declarations in decl-index

Author: dschrempf

dev/select-pass.excalidraw

@@ -457,13 +457,13 @@
       "updated": 1763179304934,
       "link": null,
       "locked": false,
-      "text": "getTransitiveAvailability",
+      "text": "getTransitiveSelectability",
       "fontSize": 20,
       "fontFamily": 5,
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": "2X3A6sCqYbvEBrGYPPdcT",
-      "originalText": "getTransitiveAvailability",
+      "originalText": "getTransitiveSelectability",
       "autoResize": true,
       "lineHeight": 1.25
     },
@@ -1748,4 +1748,4 @@
     "lockedMultiSelections": {}
   },
   "files": {}
-}
+}

examples/libpcap/generate-and-run.sh

@@ -11,6 +11,7 @@ export PROJECT_ROOT
     echo "# Building libpcap"
     echo "# "
 
+    rm -rfv libpcap*
     wget https://www.tcpdump.org/release/libpcap-1.10.5.tar.xz
     tar -xf libpcap-1.10.5.tar.xz
     mv libpcap-1.10.5 libpcap

examples/libpcap/generate.sh

@@ -26,9 +26,15 @@ libclang_flags=(
 # the declarations into an `hs-bindgen`-internal abstract syntax tree. These
 # flags affect the parsing/reifying step.
 parse_flags=(
-    # TODO: We panic without `--parse-all`, see
-    # https://github.com/well-typed/hs-bindgen/issues/1155.
-    --parse-all
+    # The external binding specifications we provide for the C standard library
+    # do not cover all definitions. We instruct `hs-bindgen` to parse additional
+    # headers.
+    --parse-by-header-path "struct_timeval.h"
+    --parse-by-header-path "socket.h"
+    # By default `hs-bindgen` parses all headers in the main header directory,
+    # but we adjust the parse predicate above, and so need to provide this
+    # option.
+    --parse-from-main-header-dirs
 )
 
 # We only generate bindings for a sub-set of all parsed/reified declarations.
@@ -56,9 +62,8 @@ select_flags=(
 # For example, activate Info-level log messages to see which declarations are
 # selected/not selected, or which C macros we succeed or fail to parse.
 debug_flags=(
-    # # Run `hs-bindgen` with log level "Info".
+    # # Run `hs-bindgen` with log level "Info" or "Debug".
     # -v3
-    # # Run `hs-bindgen` with log level "Debug".
     # -v4
 )
 

hs-bindgen/examples/golden/declarations/select_scoping.h

@@ -2,7 +2,6 @@
 // select!
 #include "select_scoping_header.h"
 
-
 // This declaration is parsed _and_ selected.
 typedef int ParsedAndSelected1;
 
@@ -12,4 +11,4 @@ typedef ParsedAndNotSelected ParsedAndSelected2;
 
 // This declaration is parsed _and_ selected. The dependency is _not_ parsed nor
 // selected (custom parse predicate).
-typedef struct PossiblyNotParsedDefinitelyNotSelected ParsedAndSelected3;
+typedef struct ParseNotAttemptedNotSelected ParsedAndSelected3;

hs-bindgen/examples/golden/declarations/select_scoping_header.h

@@ -4,6 +4,6 @@ typedef int ParsedAndNotSelected;
 
 // This declaration is _not_ parsed by the test, which uses a custom parse
 // predicate.
-struct PossiblyNotParsedDefinitelyNotSelected {
+struct ParseNotAttemptedNotSelected {
   int x;
 };

hs-bindgen/examples/golden/edge-cases/duplicate.h

@@ -0,0 +1,3 @@
+#include "duplicate_macro.h"
+
+void function(duplicate x);

hs-bindgen/examples/golden/edge-cases/duplicate_macro.h

@@ -0,0 +1,2 @@
+typedef int duplicate;
+#define duplicate duplicate

hs-bindgen/fixtures/declarations/select_scoping/Example.hs

@@ -26,7 +26,7 @@ import Prelude (Bounded, Enum, Eq, Integral, Num, Ord, Read, Real, Show)
 
 {-| __C declaration:__ @ParsedAndSelected1@
 
-    __defined at:__ @declarations\/select_scoping.h:7:13@
+    __defined at:__ @declarations\/select_scoping.h:6:13@
 
     __exported by:__ @declarations\/select_scoping.h@
 -}

hs-bindgen/fixtures/declarations/select_scoping/th.txt

@@ -2,15 +2,15 @@
 -- addDependentFile examples/golden/declarations/select_scoping.h
 {-| __C declaration:__ @ParsedAndSelected1@
 
-    __defined at:__ @declarations\/select_scoping.h:7:13@
+    __defined at:__ @declarations\/select_scoping.h:6:13@
 
     __exported by:__ @declarations\/select_scoping.h@
 -}
 newtype ParsedAndSelected1
     = ParsedAndSelected1 {un_ParsedAndSelected1 :: CInt}
       {- ^ __C declaration:__ @ParsedAndSelected1@
 
-           __defined at:__ @declarations\/select_scoping.h:7:13@
+           __defined at:__ @declarations\/select_scoping.h:6:13@
 
            __exported by:__ @declarations\/select_scoping.h@
       -}

hs-bindgen/fixtures/edge-cases/duplicate/Example.hs

@@ -0,0 +1 @@
+module Example () where