src: move some code under comp/

.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

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

src/Makefile

@@ -56,7 +56,7 @@ all: install
 install clean full_clean:
 	$(MAKE)  -C vendor/stp   PREFIX=$(PREFIX)  $@
 	$(MAKE)  -C vendor/yices PREFIX=$(PREFIX)  $@
-	$(MAKE)  -C vendor/htcl  PREFIX=$(PREFIX)  $@
+	$(MAKE)  -C comp/HTcl    PREFIX=$(PREFIX)  $@
 	# we need to build targets from here sequentially, as they operate in the same workspace
 	$(MAKE)  -C comp -j1   PREFIX=$(PREFIX)  $@
 	$(MAKE)  -C Libraries  PREFIX=$(PREFIX)  $@
@@ -68,4 +68,3 @@ install clean full_clean:
 	$(MAKE)  -C bluetcl    PREFIX=$(PREFIX)  $@
 	$(MAKE)  -C bluesim    PREFIX=$(PREFIX)  $@
 	$(MAKE)  -C Verilator  PREFIX=$(PREFIX)  $@
-

src/comp/.ghci

@@ -20,15 +20,15 @@
 :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
 :set -i../vendor/yices/include_hs
-:set -i../vendor/htcl
+:set -iHTcl
 
 :set -I/usr/include/tcl
-:set -L../vendor/htcl
+:set -LHTcl
 :set -lhtcl
 
 :set -L../vendor/stp/lib

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
@@ -56,7 +56,7 @@ YICES_INC_FLAGS = -I../vendor/yices/include
 YICES_LIB_FLAGS = -L../vendor/yices/lib -lyices
 
 # HTCL
-HTCL_HS = ../vendor/htcl
+HTCL_HS = HTcl
 HTCL_INC_FLAGS = -L$(HTCL_HS)
 HTCL_LIB_FLAGS = -lhtcl
 
@@ -170,7 +170,7 @@ GHCINCLUDES =  \
 GHCTMP = '-tmpdir $(TMPDIR)'
 # Default RTS flags for programs built with a Haskell main
 # 256MB heap, 10MB stack, 1 second interval between heap profiles
-# If you modify this, also update rts_opts in ../vendor/htcl/haskell.c
+# If you modify this, also update rts_opts in HTcl/haskell.c
 RTSFLAGS = "-with-rtsopts=-H256m -K10m -i1"
 FVIA ?= -fasm
 GHCFLAGS = \

util/haskell-language-server/gen_hie.py

@@ -11,13 +11,13 @@
     "./Libs",
     "./GHC",
     "./GHC/posix",
+    "./HTcl",
     "./Parser",
     "./Parser/BSV",
     "./Parser/Classic",
-    "../Parsec",
+    "./Parsec",
     "../vendor/stp/include_hs",
     "../vendor/yices/include_hs",
-    "../vendor/htcl"
 ]
 
 arguments = ["-i"]
@@ -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))