Make cat-tokens into a Haskell binary

Author: facundominguez

WORKSPACE

@@ -153,12 +153,6 @@ haskell_register_ghc_nixpkgs(
     ],
 )
 
-nixpkgs_package(
-    name = "sed",
-    attribute_path = "gnused",
-    repository = "@nixpkgs",
-)
-
 nixpkgs_package(
     name = "hspec-discover",
     attribute_path = "haskellPackages.hspec-discover",

jni/BUILD.bazel

@@ -1,51 +1,10 @@
 load(
     "@rules_haskell//haskell:defs.bzl",
+    "haskell_binary",
     "haskell_library",
     "haskell_test",
 )
 
-# Note cat-tokens
-#
-# This is a script to concatenate tokens after CPP preprocessing.
-#
-# On OSX we used to rely on cpphs to concatenate tokens in
-# definitions like
-#
-# define GET_FIELD(name, hs_rettype, c_rettype) \
-#   get/**/name/**/Field :: Coercible o (J a) => o -> JFieldID -> IO hs_rettype;
-#
-# The C preprocessor in OSX would otherwise replace the
-# comments with whitespaces.
-#
-# Using cpphs, however, required a couple of hacks to workaround
-# https://github.com/haskell/cabal/issues/4278
-# https://gitlab.haskell.org/ghc/ghc/-/issues/17185
-#
-# And moreover, when using rules_haskell, ghc passes response files to cpphs,
-# which are unsupported.
-# https://github.com/tweag/rules_haskell/pull/836
-#
-# Therefore, we currently resolve concatenation with a custom
-# preprocessor to avoid the pile of hacks. The concatenator operator is ####.
-#
-# define GET_FIELD(name, hs_rettype, c_rettype) \
-#   get####name####Field :: Coercible o (J a) => o -> JFieldID -> IO hs_rettype;
-#
-genrule(
-    name = "cat-tokens-sh",
-    srcs = [],
-    outs = ["cat-tokens.sh"],
-    cmd = """
-cat > $@ <<END
-#!/bin/sh
-( echo "{-# LINE 1 \\"\\$$1\\" #-}" ; $(location @sed//:bin) 's/####//g' \\$$2) > \\$$3
-exit \\$$?
-END
-    """,
-    executable = 1,
-    tools = ["@sed//:bin"],
-)
-
 # rule generated from jni/jni.cabal by gazelle_cabal
 haskell_library(
     name = "jni",
@@ -63,15 +22,11 @@ haskell_library(
         "src/linear-types/Foreign/JNI/Safe.hs",
         "src/linear-types/Foreign/JNI/Types/Safe.hs",
     ],
-    extra_srcs = ["//jni:cat-tokens-sh"],
-    # keep
     ghcopts = [
         "-DVERSION_jni=\"0.8.0\"",
-        "-F",
-        "-pgmF$(location cat-tokens-sh)",
+        "-DJNI_CAT_TOKENS_PATH=$(location :cat-tokens)",
     ],
-    # keep
-    tools = ["@sed//:bin"],
+    tools = [":cat-tokens"],
     version = "0.8.0",
     visibility = ["//visibility:public"],
     deps = [
@@ -120,3 +75,17 @@ haskell_test(
         "@stackage//:singletons-base",
     ],
 )
+
+# rule generated from jni/jni.cabal by gazelle_cabal
+haskell_binary(
+    name = "cat-tokens",
+    srcs = ["cat-tokens/Main.hs"],
+    ghcopts = ["-DVERSION_jni=\"0.8.0\""],
+    main_file = "cat-tokens/Main.hs",
+    version = "0.8.0",
+    visibility = ["//visibility:public"],
+    deps = [
+        "@stackage//:base",
+        "@stackage//:bytestring",
+    ],
+)

jni/cat-tokens.sh

@@ -10,8 +10,8 @@ maintainer:          [email protected]
 copyright:           2015-2016 EURL Tweag.
 category:            FFI, JVM, Java
 build-type:          Simple
-cabal-version:       >=2.0
-extra-source-files:  README.md cat-tokens.sh
+cabal-version:       2.0
+extra-source-files:  README.md
 
 source-repository head
   type: git
@@ -25,10 +25,6 @@ flag linear-types
 library
   hs-source-dirs: src/common src/linear-types
   cc-options: -std=c11
-  -- XXX issues with CPP make more convenient using
-  -- a custom preprocessor to deal with concatenation.
-  -- See note cat-tokens in jni/BUILD.bazel.
-  ghc-options: -F -pgmF./cat-tokens.sh
   extra-libraries: jvm
   exposed-modules:
     Foreign.JNI
@@ -57,6 +53,20 @@ library
     stm >= 2.3,
     text >= 1.2.3
   default-language: Haskell2010
+  -- XXX issues with CPP make more convenient using
+  -- a custom preprocessor to deal with concatenation.
+  -- See jni/cat-tokens/Main.hs.
+  cpp-options: -DJNI_CAT_TOKENS_PATH=cat-tokens
+  build-tool-depends:
+    jni:cat-tokens
+
+executable cat-tokens
+  hs-source-dirs: cat-tokens
+  main-is: Main.hs
+  build-depends:
+    base,
+    bytestring
+  default-language: Haskell2010
 
 test-suite spec
   type:

jni/jni.cabal

@@ -10,10 +10,10 @@
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE ViewPatterns #-}
 
-{-# OPTIONS_GHC -fno-warn-name-shadowing #-}
+{-# OPTIONS_GHC -fno-warn-name-shadowing -F -pgmF JNI_CAT_TOKENS_PATH #-}
 
 -- XXX This file uses #### for concatenating tokens with a preprocessor in
--- a portable way. See note cat-tokens in jni/BUILD.bazel.
+-- a portable way. See note cat-tokens in jni/cat-tokens/Main.hs.
 
 module Foreign.JNI.Unsafe.Internal
   ( -- * JNI functions

jni/src/common/Foreign/JNI/Unsafe/Internal.hs

@@ -60,8 +60,10 @@
 {-# LANGUAGE LinearTypes #-}
 {-# LANGUAGE NoImplicitPrelude #-}
 
+{-# OPTIONS_GHC -fno-warn-name-shadowing -F -pgmF JNI_CAT_TOKENS_PATH #-}
+
 -- XXX This file uses #### for concatenating tokens with a preprocessor in
--- a portable way. See note cat-tokens in jni/BUILD.bazel.
+-- a portable way. See cat-tokens/Main.hs.
 
 module Foreign.JNI.Safe
   ( module Foreign.JNI.Safe