Merge pull request #65 from Anut-py/lens

Flag to disable lens

Author: Anut-py

.github/workflows/cabal-build.yml

@@ -11,13 +11,14 @@ permissions:
 
 jobs:
   cabal-build:
-    name: GHC ${{ matrix.ghc-version }} on ${{ matrix.os }}
+    name: "GHC ${{ matrix.ghc-version }} on ${{ matrix.os }} (lens: ${{ matrix.lens }})"
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        ghc-version: ["9.8", "9.6", "9.2"]
+        ghc-version: ["9.12", "9.10", "9.6", "9.2"]
+        lens: [true, false]
         exclude:
           - os: macos-latest
             ghc-version: "9.2"
@@ -43,33 +44,18 @@ jobs:
           sudo apt install -y x11proto-xext-dev libx11-dev xorg-dev freeglut3-dev
 
       - name: Configure the build
+        if: matrix.lens
         run: |
           cabal configure --enable-tests --enable-benchmarks --disable-documentation
           cabal build --dry-run
         # The last step generates dist-newstyle/cache/plan.json for the cache key.
 
-      # IMPT: Uncomment when adding steps after cabal build
-      # - name: Restore cached dependencies
-      #   uses: actions/cache/restore@v4
-      #   id: cache
-      #   env:
-      #     key: ${{ runner.os }}-ghc-${{ steps.setup.outputs.ghc-version }}-cabal-${{ steps.setup.outputs.cabal-version }}
-      #   with:
-      #     path: ${{ steps.setup.outputs.cabal-store }}
-      #     key: ${{ env.key }}-plan-${{ hashFiles('**/plan.json') }}
-      #     restore-keys: ${{ env.key }}-
-
-      # - name: Install dependencies
-      #   run: cabal build all --only-dependencies
-
-      # # Cache dependencies already here, so that we do not have to rebuild them should the subsequent steps fail.
-      # - name: Save cached dependencies
-      #   uses: actions/cache/save@v4
-      #   # Caches are immutable, trying to save with the same key would error.
-      #   if: ${{ steps.cache.outputs.cache-primary-key != steps.cache.outputs.cache-matched-key }}
-      #   with:
-      #     path: ${{ steps.setup.outputs.cabal-store }}
-      #     key: ${{ steps.cache.outputs.cache-primary-key }}
+      - name: Configure the build (no lens)
+        if: ${{ !matrix.lens }}
+        run: |
+          cabal configure --enable-tests --enable-benchmarks --disable-documentation -fdisable-lens
+          cabal build --dry-run
+        # The last step generates dist-newstyle/cache/plan.json for the cache key.
 
       - name: Build
         run: cabal build all

cabal.project

@@ -1,6 +1,6 @@
 packages: *.cabal
 
-optimization: 2
+optimization: 0
 
 package h-raylib
   flags: +examples

h-raylib.cabal

@@ -45,7 +45,7 @@ data-files:
 
 source-repository head
   type:     git
-  location: git://github.com/Anut-py/h-raylib.git
+  location: https://github.com/Anut-py/h-raylib.git
 
 flag detect-platform
   description:
@@ -101,6 +101,11 @@ flag ghci
   default:     False
   manual:      True
 
+flag disable-lens
+  description: Exclude the lens dependency and Raylib.Util.Lenses
+  default:     False
+  manual:      True
+
 common example-options
   default-language: Haskell2010
 
@@ -229,24 +234,34 @@ library
     Raylib.Util.Colors
     Raylib.Util.GUI
     Raylib.Util.GUI.Styles
-    Raylib.Util.Lenses
     Raylib.Util.Math
     Raylib.Util.RLGL
 
+  if !flag(disable-lens)
+    exposed-modules:
+      Raylib.Util.Lenses
+
   other-modules:
     Raylib.Internal.TH
     Raylib.Internal.Web.Native
     Raylib.Internal.Web.Processable
 
+  if !flag(disable-lens)
+    other-modules:
+      Raylib.Util.Lenses.TH
+  
   build-depends:
     , base              >=4.0      && <4.22
     , bytestring        >=0.11.0   && <0.13
-    , containers        >=0.6.0    && <0.7
-    , exceptions        >=0.10.4   && <0.11
-    , lens              >=4.0      && <5.4
-    , linear            >=1.22     && <1.24
-    , template-haskell  >=2.16.0.0 && <2.23.0.0
+    , containers        >=0.6.0    && <0.9
+    , template-haskell  >=2.16.0.0 && <2.24
     , text              >=2.0      && <2.2
+  
+  
+  if !flag(disable-lens)
+    build-depends:
+      , linear            >=1.22     && <1.24
+      , lens              >=4.0      && <5.4
 
   hs-source-dirs:   src
   default-language: Haskell2010
@@ -363,3 +378,6 @@ library
 
   if flag(ghci)
     cpp-options: -DGHCI
+  
+  if flag(disable-lens)
+    cpp-options: -DDISABLE_LENS

src/Raylib/Internal/Foreign.hs

@@ -44,8 +44,13 @@ import qualified Data.Text.Encoding as TE
 import Foreign (FunPtr, Ptr, Storable (peek, peekByteOff, poke, sizeOf), allocaBytes, castPtr, malloc, newArray, nullPtr, peekArray, plusPtr, pokeArray0, with, withArray, withArrayLen)
 import Foreign.C (CFloat, CInt, CString, CUChar, CUInt, peekCString, withCString)
 import Foreign.C.Types (CBool, CChar, CShort, CUShort)
+
+#ifndef DISABLE_LENS
+
 import Linear (V2, V3, V4)
 
+#endif
+
 -- Internal utility functions
 
 #ifdef WEB_FFI
@@ -111,12 +116,16 @@ instance (Freeable a, Storable a) => Freeable [a] where
           let val = arr !! i in rlFreeDependents val (plusPtr ptr (i * sizeOf val))
       )
 
+#ifndef DISABLE_LENS
+
 instance Freeable (V2 a)
 
 instance Freeable (V3 a)
 
 instance Freeable (V4 a)
 
+#endif
+
 rlFreeMaybeArray :: (Freeable a, Storable a) => Maybe [a] -> Ptr a -> IO ()
 rlFreeMaybeArray Nothing _ = return ()
 rlFreeMaybeArray (Just arr) ptr = rlFree arr (castPtr ptr)

src/Raylib/Internal/TH.hs

@@ -3,59 +3,33 @@
 {-# LANGUAGE TupleSections #-}
 
 -- | Template Haskell functions used internally
-module Raylib.Internal.TH (genLenses, genNative) where
-
-import Control.Lens (makeLensesFor)
-import Control.Monad (zipWithM)
+module Raylib.Internal.TH (genNative) where
 
 #ifdef WEB_FFI
 
 import Language.Haskell.TH
   ( Body (NormalB),
     Clause (Clause),
-    Con (RecC),
-    Dec (DataD, FunD, SigD),
+    Dec (FunD, SigD),
     DecsQ,
     Exp (AppE, LitE, VarE),
-    Info (TyConI),
     Lit (StringL),
-    Name,
     TypeQ,
     mkName,
-    nameBase,
-    reify,
   )
 import Raylib.Internal.Web.Native (callRaylibFunction)
 
 #else
 
 import Language.Haskell.TH
-  ( Con (RecC),
-    Dec (DataD, ForeignD),
+  ( Dec (ForeignD),
     DecsQ,
-    Info (TyConI),
-    Name,
     TypeQ,
-    mkName,
-    nameBase,
-    reify, Foreign (ImportF), Callconv (CCall), Safety (Safe),
+    mkName, Foreign (ImportF), Callconv (CCall), Safety (Safe),
   )
 
 #endif
 
--- | Creates lenses with an underscore before field names; e.g. @vector2'x@
---   becomes the lens @_vector2'x@
-genLenses :: [Name] -> DecsQ
-genLenses names = do
-  infos <- mapM reify names
-  concat <$> zipWithM genLensesForType names infos
-  where
-    genLensesForType name (TyConI (DataD _ _ _ _ [RecC _ ctors] _)) =
-      makeLensesFor mapping name
-      where
-        mapping = map (\(a, _, _) -> let fName = nameBase a in (fName, '_' : fName)) ctors
-    genLensesForType _ _ = error "(genLenses) Received a name that does not refer to a valid type!"
-
 -- | Generates native code for the given functions. On non-web platforms, this
 --   means @foreign import@ statements. On web platforms, this means
 --   `callRaylibFunction` calls.