diff --git a/README.md b/README.md index 0aa8800..c6027f3 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Main repo: https://git.sudoer.ch/me/really-bad-compiler-in-haskell - Language: Haskell - Haskell tools: GHCup, Stack, Cabal -- Libraries: megaparsec, parser-combinators, text +- Libraries: megaparsec, parser-combinators, text, llvm-hs-pure - IDE: VSCodium - Git platform: Forgejo - AI: Phind diff --git a/package.yaml b/package.yaml index 32ff1aa..b402393 100644 --- a/package.yaml +++ b/package.yaml @@ -1,17 +1,27 @@ name: really-bad-compiler-in-haskell version: 0 author: sudoer777 -maintainer: git@sudoer.ch dependencies: - - base - - megaparsec + - base >= 4.16.4 && < 5 + - megaparsec >= 9.2.2 && < 10 - parser-combinators - text + - llvm-hs-pure >= 15 && < 16 + # - llvm-hs-pretty >= 0.9 && < 1 tested-with: GHC == 9.2.8 +category: Compilers/Interpreters -ghc-options: -threaded -Wall -j +RTS -A32M -RTS +ghc-options: -threaded -Wall -j8 +RTS -A64M -RTS -executables: - compiler: - source-dirs: app - main: Main.hs +# library: +# source-dirs: src + +executable: + source-dirs: app + main: Main.hs +# tests: +# testall: +# main: Testall.hs +# source-dirs: test + +# default-extensions: OverloadedStrings, LambdaCase diff --git a/really-bad-compiler-in-haskell.cabal b/really-bad-compiler-in-haskell.cabal index c00d58f..eeb4c2a 100644 --- a/really-bad-compiler-in-haskell.cabal +++ b/really-bad-compiler-in-haskell.cabal @@ -6,13 +6,14 @@ cabal-version: 1.12 name: really-bad-compiler-in-haskell version: 0 +category: Compilers/Interpreters author: sudoer777 -maintainer: git@sudoer.ch +maintainer: sudoer777 build-type: Simple tested-with: GHC == 9.2.8 -executable compiler +executable really-bad-compiler-in-haskell main-is: Main.hs other-modules: Eval.Expression @@ -21,10 +22,11 @@ executable compiler Paths_really_bad_compiler_in_haskell hs-source-dirs: app - ghc-options: -threaded -Wall -j +RTS -A32M -RTS + ghc-options: -threaded -Wall -j8 +RTS -A64M -RTS build-depends: - base - , megaparsec + base >=4.16.4 && <5 + , llvm-hs-pure ==15.* + , megaparsec >=9.2.2 && <10 , parser-combinators , text default-language: Haskell2010 diff --git a/stack.yaml b/stack.yaml index 4be007a..9d3fff2 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,67 +1,10 @@ -# This file was automatically generated by 'stack init' -# -# Some commonly used options have been documented as comments in this file. -# For advanced use and comprehensive documentation of the format, please see: -# https://docs.haskellstack.org/en/stable/yaml_configuration/ +resolver: lts-20.26 -# Resolver to choose a 'specific' stackage snapshot or a compiler version. -# A snapshot resolver dictates the compiler version and the set of packages -# to be used for project dependencies. For example: -# -# resolver: lts-3.5 -# resolver: nightly-2015-09-21 -# resolver: ghc-7.10.2 -# -# The location of a snapshot can be provided as a file or url. Stack assumes -# a snapshot provided as a file might change, whereas a url resource does not. -# -# resolver: ./custom-snapshot.yaml -# resolver: https://example.com/snapshots/2018-01-01.yaml -resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/26.yaml - -# User packages to be built. -# Various formats can be used as shown in the example below. -# -# packages: -# - some-directory -# - https://example.com/foo/bar/baz-0.0.2.tar.gz -# subdirs: -# - auto-update -# - wai packages: - . -# Dependency packages to be pulled from upstream that are not in the resolver. -# These entries can reference officially published versions as well as -# forks / in-progress versions pinned to a git hash. For example: -# -# extra-deps: -# - acme-missiles-0.3 -# - git: https://github.com/commercialhaskell/stack.git -# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# -# extra-deps: [] - -# Override default flag values for local packages and extra-deps -# flags: {} - -# Extra package databases containing global packages -# extra-package-dbs: [] - -# Control whether we use the GHC we find on the path -# system-ghc: true -# -# Require a specific version of Stack, using version ranges -# require-stack-version: -any # Default -# require-stack-version: ">=2.9" -# -# Override the architecture used by Stack, especially useful on Windows -# arch: i386 -# arch: x86_64 -# -# Extra directories used by Stack for building -# extra-include-dirs: [/path/to/dir] -# extra-lib-dirs: [/path/to/dir] -# -# Allow a newer minor version of GHC than the snapshot specifies -# compiler-check: newer-minor +extra-deps: + # - llvm-hs-pretty-0.9.0.0 + - github: llvm-hs/llvm-hs + commit: 5bca2c1a2a3aa98ecfb19181e7a5ebbf3e212b76 + subdirs: + - llvm-hs-pure diff --git a/stack.yaml.lock b/stack.yaml.lock index eef24df..6b809c3 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -3,11 +3,23 @@ # For more information, please see the documentation at: # https://docs.haskellstack.org/en/stable/lock_files -packages: [] +packages: +- completed: + name: llvm-hs-pure + pantry-tree: + sha256: b512f9e5f8f2b3e3a06bad2fa5ff053a83d817798c7efcd47e254e68c842169d + size: 2712 + sha256: 526b67e2da9ce25b3856c221b6772e699a7593dbb5ba38e7ee2436349de70966 + size: 9802209 + subdir: llvm-hs-pure + url: https://github.com/llvm-hs/llvm-hs/archive/5bca2c1a2a3aa98ecfb19181e7a5ebbf3e212b76.tar.gz + version: 15.0.0 + original: + subdir: llvm-hs-pure + url: https://github.com/llvm-hs/llvm-hs/archive/5bca2c1a2a3aa98ecfb19181e7a5ebbf3e212b76.tar.gz snapshots: - completed: sha256: 5a59b2a405b3aba3c00188453be172b85893cab8ebc352b1ef58b0eae5d248a2 size: 650475 url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/26.yaml - original: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/26.yaml + original: lts-20.26