README.md

@@ -1,26 +1,14 @@
 # Really Bad Compiler in Haskell
 
-A compiler written in Haskell which can currently perform basic arithmetic using the megaparsec and llvm-hs libraries (I do not know what language I am going to compile yet). Built for the Introduction to Compiler Design class at The University of Texas at Dallas.
+A compiler written in Haskell that is really bad (I do not know what language I am going to compile yet). Built for the Introduction to Compiler Design class at The University of Texas at Dallas.
 
 Main repo: https://git.sudoer.ch/me/really-bad-compiler-in-haskell
 
 ## Build Instructions
 
-- Install `ghcup` (for managing Haskell tools) and `nix` (for managing external dependencies).
 - Clone the repo.
-- Use `ghcup` to install `stack 2.9.3`, `HLS 2.2.0.0`, `GHC 9.2.8`, and `cabal 3.6.2.0`.
+- Use `ghcup` to install all of the Haskell tools.
-- Use `stack run <file>` to run the program (for example, `stack run example/1`).
+- Use `stack build` and `stack run <file>` to run the program.
-
-## Known bugs
-
-### Building
-
-- If llvm_16 is in the nix store, stack will use it for some reason and the build will fail. Currently, you may need to run `nix-store --delete /nix/store/<llvm16devdirectory>` to build it.
-
-## File structure
-
-- `app` - contains the compiler program
-- `example` - contains example programs that can be compiled
 
 ## Credits
 
@@ -30,16 +18,12 @@ Main repo: https://git.sudoer.ch/me/really-bad-compiler-in-haskell
 - learnyouahaskell.com (for learning Haskell basics)
 - https://akashagrawal.me/2017/01/19/beginners-guide-to-megaparsec.html
 - https://markkarpov.com/tutorial/megaparsec.html (for help writing a Haskell equation parser)
-- https://www.forth.com/starting-forth/1-forth-stacks-dictionary/ (for learning Forth)
-- https://blog.josephmorag.com/posts/mcc0/ (Haskell compiler tutorial with megaparsec, llvm-hs, and nix)
-- https://gh.sudoer.ch/llvm-hs/llvm-hs-examples (for help writing an llvm code generator)
 
 ### Tools
 
 - Language: Haskell
 - Haskell tools: GHCup, Stack, Cabal
-- Libraries: megaparsec, parser-combinators, text, llvm-hs-pure
+- Libraries: megaparsec, parser-combinators, text
-- Dependencies: llvm, clang
 - IDE: VSCodium
 - Git platform: Forgejo
 - AI: Phind

app/LLVMGen/Expression.hs

@@ -1,51 +0,0 @@
-module LLVMGen.Expression () where
-
-import qualified Objects.Expression as Expr
-
-import LLVM.AST
-import qualified LLVM.AST as AST
-import LLVM.AST.Global
-import LLVM.Context
-import LLVM.Module
-
-import Data.ByteString.Char8 as BS
-
-int :: Type
-int = IntegerType 32
-
-defAdd :: Definition
-defAdd = GlobalDefinition functionDefaults
-  { name = Name "add"
-  , parameters =
-      ( [ Parameter int (Name "a") []
-        , Parameter int (Name "b") [] ]
-      , False )
-  , returnType = int
-  , basicBlocks = [body]
-  }
-  where
-    body = BasicBlock
-        (Name "entry")
-        [ Name "result" :=
-            Add False  -- no signed wrap
-                False  -- no unsigned wrap
-                (LocalReference int (Name "a"))
-                (LocalReference int (Name "b"))
-                []]
-        (Do $ Ret (Just (LocalReference int (Name "result"))) [])
-
-
-module_ :: AST.Module
-module_ = defaultModule
-  { moduleName = "basic"
-  , moduleDefinitions = [defAdd]
-  }
-
-
-toLLVM :: AST.Module -> IO ()
-toLLVM modul = withContext $ \ctx -> do
-  llvm <- withModuleFromAST ctx modul moduleLLVMAssembly
-  BS.putStrLn llvm
-
-main :: IO ()
-main = toLLVM module_

example/1

@@ -1 +0,0 @@
-5*3+2

example/2

@@ -1 +0,0 @@
-6+8/3

package.yaml

@@ -1,30 +0,0 @@
-name: really-bad-compiler-in-haskell
-version: 0
-author: sudoer777
-dependencies:
-  - base >= 4.14.3 && < 5
-  - megaparsec >= 9.0.1 && < 10
-  - parser-combinators
-  - text
-  - llvm-hs >= 15 && < 16
-  - llvm-hs-pure >= 15 && < 16
-  # - llvm-hs-pretty >= 15 && < 16
-  - bytestring
-tested-with: GHC == 9.2.8
-category: Compilers/Interpreters
-
-ghc-options: -threaded -Wall -j8 +RTS -A64M -RTS -fllvm
-
-# library:
-#   source-dirs: src
-
-executable:
-  source-dirs: app
-  main: Main.hs
-# tests:
-#   testall:
-#     main: Testall.hs
-#     source-dirs: test
-
-default-extensions: OverloadedStrings, LambdaCase
-# flags: -fno-hs-llvm=true

really-bad-compiler-in-haskell.cabal

@@ -1,37 +1,39 @@
-cabal-version: 1.12
+cabal-version:      2.4
+name:               really-bad-compiler-in-haskell
+version:            0.1.0.0
 
--- This file has been generated from package.yaml by hpack version 0.35.1.
+-- A short (one-line) description of the package.
---
+-- synopsis:
--- see: https://github.com/sol/hpack
 
-name:           really-bad-compiler-in-haskell
+-- A longer description of the package.
-version:        0
+-- description:
-category:       Compilers/Interpreters
+
-author:         sudoer777
+-- A URL where users can report bugs.
-maintainer:     sudoer777
+-- bug-reports:
-build-type:     Simple
+
-tested-with:
+-- The license under which the package is released.
-    GHC == 9.2.8
+-- license:
+author:             sudoer777
+maintainer:         git@sudoer.ch
+
+-- A copyright notice.
+-- copyright:
+-- category:
+extra-source-files:
+    CHANGELOG.md
+    README.md
 
 executable really-bad-compiler-in-haskell
-  main-is: Main.hs
+    main-is:          Main.hs
-  other-modules:
+
-      Eval.Expression
+    -- Modules included in this executable, other than Main.
-      LLVMGen.Expression
+    -- other-modules:
-      Objects.Expression
+
-      Parser.Expression
+    -- LANGUAGE extensions used by modules in this package.
-      Paths_really_bad_compiler_in_haskell
+    -- other-extensions:
-  hs-source-dirs:
+    build-depends:    base ^>=4.16.4.0
-      app
+                    , megaparsec >= 9.2.2
-  default-extensions:
+                    , parser-combinators
-      OverloadedStrings, LambdaCase
+                    , text
-  ghc-options: -threaded -Wall -j8 +RTS -A64M -RTS -fllvm
+    hs-source-dirs:   app
-  build-depends:
+    default-language: Haskell2010
-      base >=4.14.3 && <5
-    , bytestring
-    , llvm-hs ==15.*
-    , llvm-hs-pure ==15.*
-    , megaparsec >=9.0.1 && <10
-    , parser-combinators
-    , text
-  default-language: Haskell2010

stack.yaml

@@ -1,17 +1,67 @@
-resolver: lts-20.26
+# 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 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:
-  - .
+- .
-extra-deps:
+# Dependency packages to be pulled from upstream that are not in the resolver.
-  # - github: hyunsooda/llvm-hs-pretty-15
+# These entries can reference officially published versions as well as
-  #   commit: 79283942d1667168ecd65237667aff7fed730303
+# forks / in-progress versions pinned to a git hash. For example:
-  - github: llvm-hs/llvm-hs
+#
-    commit: 5bca2c1a2a3aa98ecfb19181e7a5ebbf3e212b76
+# extra-deps:
-    subdirs:
+# - acme-missiles-0.3
-      - llvm-hs-pure
+# - git: https://github.com/commercialhaskell/stack.git
-      - llvm-hs
+#   commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a
-nix:
+#
-  enable: true
+# extra-deps: []
-  packages: [llvm_15, clang_15, libxml2]
+
-system-ghc: true
+# Override default flag values for local packages and extra-deps
-install-ghc: true
+# 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

stack.yaml.lock

@@ -3,36 +3,11 @@
 # 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
-- completed:
-    name: llvm-hs
-    pantry-tree:
-      sha256: 21f74a6f51fae6c0a0fcf3e6620a59f341289ac743998b41ed3276fd1b7d8862
-      size: 12716
-    sha256: 526b67e2da9ce25b3856c221b6772e699a7593dbb5ba38e7ee2436349de70966
-    size: 9802209
-    subdir: llvm-hs
-    url: https://github.com/llvm-hs/llvm-hs/archive/5bca2c1a2a3aa98ecfb19181e7a5ebbf3e212b76.tar.gz
-    version: 15.0.0
-  original:
-    subdir: llvm-hs
-    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: lts-20.26
+  original:
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/26.yaml