src: move Parsec/ under comp/

The top-level structure under `src/` is awkward and it's unclear why Parsec is here. Why not `vendor/`? Ultimately though, I think the best place is actually inside the source code, because it's not like anything else uses it and it's `bsc`-owned code already in practice anyway. Signed-off-by: Austin Seipp <aseipp@pobox.com>
B-Lang-org · Jul 20, 2024 · c0b6fcf · c0b6fcf
1 parent 9a97f9d
commit c0b6fcf
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 8 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,10 +1,10 @@
 # Tell Linguist not to include the following code
 # in statistics about this repo
 #
-src/Parsec/**  linguist-vendored
+src/comp/Parsec/**     linguist-vendored
 src/vendor/stp/src/**  linguist-vendored
-testsuite/**  linguist-vendored
-doc/**  linguist-documentation
+testsuite/**           linguist-vendored
+doc/**                 linguist-documentation
 
 # Scripts that query git for commit info will not work
 # if the source is not in a git repo, so when exporting

diff --git a/COPYING b/COPYING
@@ -42,7 +42,7 @@ license.  The following are known to have other authors and licenses:
   * See LICENSES/LICENSE.hbc
 
 * Parsec
-  * Files in src/Parsec/ are adapted from Daan Leijen's Parsec
+  * Files in src/comp/Parsec/ are adapted from Daan Leijen's Parsec
     Haskell library
   * See LICENSES/LICENSE.parsec
   * Source and license obtained on 2004-01-28 from

diff --git a/src/comp/.ghci b/src/comp/.ghci
@@ -20,7 +20,7 @@
 :set -package syb
 
 -- Haskell source
-:set -i../comp:../comp/Libs:../comp/GHC:../comp/GHC/posix:../Parsec
+:set -i../comp:../comp/Libs:../comp/GHC:../comp/GHC/posix:../comp/Parsec
 
 -- Shared libraries and FFI bindings
 :set -i../vendor/stp/include_hs

diff --git a/src/comp/Makefile b/src/comp/Makefile
@@ -43,7 +43,7 @@ BINDIR=$(PREFIX)/bin
 BUILDDIR=$(TOP)/build/comp
 
 # Parsec
-PARSEC_HS = ../Parsec
+PARSEC_HS = Parsec
 
 # STP
 STP_HS = ../vendor/stp/include_hs

diff --git a/src/Parsec/Parsec.hs → src/comp/Parsec/Parsec.hs b/src/Parsec/Parsec.hs → src/comp/Parsec/Parsec.hs
diff --git a/src/Parsec/ParsecChar.hs → src/comp/Parsec/ParsecChar.hs b/src/Parsec/ParsecChar.hs → src/comp/Parsec/ParsecChar.hs
diff --git a/src/Parsec/ParsecCombinator.hs → src/comp/Parsec/ParsecCombinator.hs b/src/Parsec/ParsecCombinator.hs → src/comp/Parsec/ParsecCombinator.hs
diff --git a/src/Parsec/ParsecExpr.hs → src/comp/Parsec/ParsecExpr.hs b/src/Parsec/ParsecExpr.hs → src/comp/Parsec/ParsecExpr.hs
diff --git a/src/Parsec/ParsecLanguage.hs → src/comp/Parsec/ParsecLanguage.hs b/src/Parsec/ParsecLanguage.hs → src/comp/Parsec/ParsecLanguage.hs
diff --git a/src/Parsec/ParsecPerm.hs → src/comp/Parsec/ParsecPerm.hs b/src/Parsec/ParsecPerm.hs → src/comp/Parsec/ParsecPerm.hs
diff --git a/src/Parsec/ParsecPrim.hs → src/comp/Parsec/ParsecPrim.hs b/src/Parsec/ParsecPrim.hs → src/comp/Parsec/ParsecPrim.hs
diff --git a/src/Parsec/ParsecToken.hs → src/comp/Parsec/ParsecToken.hs b/src/Parsec/ParsecToken.hs → src/comp/Parsec/ParsecToken.hs
diff --git a/util/haskell-language-server/gen_hie.py b/util/haskell-language-server/gen_hie.py
@@ -14,7 +14,7 @@
     "./Parser",
     "./Parser/BSV",
     "./Parser/Classic",
-    "../Parsec",
+    "./Parsec",
     "../vendor/stp/include_hs",
     "../vendor/yices/include_hs",
     "../vendor/htcl"
@@ -39,4 +39,4 @@
 # form and dump yaml file
 hie_yaml = {"cradle":{"direct":{"arguments":arguments}}}
 f = open("hie.yaml", "w")
-f.write(yaml.dump(hie_yaml))
+f.write(yaml.dump(hie_yaml))