Verified Commit c1a2571a authored by Camil Staps's avatar Camil Staps 🚀

Compile with -funcmayfail

parent 6dce9d63
Pipeline #17190 failed with stage
in 7 minutes and 10 seconds
...@@ -5,6 +5,7 @@ import StdBool ...@@ -5,6 +5,7 @@ import StdBool
import StdEnum import StdEnum
import StdInt import StdInt
import StdList import StdList
import StdMisc
import StdOverloaded import StdOverloaded
import StdString import StdString
...@@ -151,9 +152,11 @@ where ...@@ -151,9 +152,11 @@ where
['#'] -> "n unboxed" ['#'] -> "n unboxed"
['!'] -> " head strict" ['!'] -> " head strict"
['|'] -> "n overloaded" ['|'] -> "n overloaded"
_ -> abort "error in make_list\n"
spine = case s of spine = case s of
[] -> "" [] -> ""
['!'] -> " spine strict" ['!'] -> " spine strict"
_ -> abort "error in make_list\n"
description = "These types of list are available:\n\n" + description = "These types of list are available:\n\n" +
"- {{`[a]`}}, a normal list\n" + "- {{`[a]`}}, a normal list\n" +
......
Subproject commit 94c4bb99fa1e508684658707a30657973e312d41 Subproject commit 12d1a74a1d53bdcfd9927c067372bbdf302aa5d2
...@@ -166,7 +166,9 @@ optionDescription = WithHelp True $ Options ...@@ -166,7 +166,9 @@ optionDescription = WithHelp True $ Options
] ]
Start w Start w
# ([prog:args], w) = getCommandLine w # (prog,args,w) = case getCommandLine w of
([prog:args],w) -> (prog,args,w)
_ -> abort "getCommandLine returned 0 elements\n"
# opts = parseOptions optionDescription args zero # opts = parseOptions optionDescription args zero
| isError opts | isError opts
# (io,w) = stdio w # (io,w) = stdio w
......
...@@ -2,7 +2,7 @@ SHELL:=bash ...@@ -2,7 +2,7 @@ SHELL:=bash
BIN:=builddb CloogleServer BIN:=builddb CloogleServer
DB=types.json DB=types.json
CLM:=clm CLM:=clm
CLMFLAGS:=-h 250M -nr -nortsopts\ CLMFLAGS_BOOTSTRAP:=-h 250M -nr -nortsopts\
-P 'Cloogle'\ -P 'Cloogle'\
-IL StdEnv\ -IL StdEnv\
-IL TCPIP\ -IL TCPIP\
...@@ -12,27 +12,34 @@ CLMFLAGS:=-h 250M -nr -nortsopts\ ...@@ -12,27 +12,34 @@ CLMFLAGS:=-h 250M -nr -nortsopts\
-I Cloogle/libcloogle\ -I Cloogle/libcloogle\
-I Cloogle/CleanRegex -I Cloogle/CleanRegex
ifeq "$(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 6)" "1" ifeq "$(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 6)" "1"
CLMFLAGS+=-l -no-pie CLMFLAGS_BOOTSTRAP+=-l -no-pie
endif endif
CLMFLAGS:=$(CLMFLAGS_BOOTSTRAP) -funcmayfail
CLMLIBS_COMPILER:=\
-I Cloogle/compiler/frontend\
-I Cloogle/compiler/backend\
-I Cloogle/compiler/main\
-I Cloogle/compiler/main/Unix\
.PHONY: all clean .FORCE .PHONY: all bootstrap bootstrap_compiler clean .FORCE
all: $(BIN) $(DB) all: $(BIN) $(DB)
man: $(MAN) man: $(MAN)
CloogleServer: .FORCE CloogleServer: bootstrap .FORCE
$(CLM) $(CLMFLAGS) $@ -o $@
find -name '*.[di]cl' -not -path './Cloogle/compiler/*' -exec touch {} \;
$(CLM) $(CLMFLAGS) $@ -o $@ $(CLM) $(CLMFLAGS) $@ -o $@
builddb: Cloogle/compiler .FORCE builddb: bootstrap bootstrap_compiler .FORCE
$(CLM) $(CLMFLAGS) -s 50M -h 750M -gcm\ $(CLM) $(CLMFLAGS) $(CLMLIBS_COMPILER) -s 50M -h 750M -gcm $@ -o $@
-I Cloogle/compiler/frontend\
-I Cloogle/compiler/backend\ bootstrap: .FORCE
-I Cloogle/compiler/main\ $(CLM) $(CLMFLAGS_BOOTSTRAP) -PABC StdEnv
-I Cloogle/compiler/main/Unix\ $(CLM) $(CLMFLAGS_BOOTSTRAP) -PABC StdMaybe
$@ -o $@ $(CLM) $(CLMFLAGS_BOOTSTRAP) -PABC TCPIP
bootstrap_compiler: Cloogle/compiler .FORCE
$(CLM) $(CLMFLAGS_BOOTSTRAP) $(CLMLIBS_COMPILER) -PABC cocl
Cloogle/compiler: .FORCE Cloogle/compiler: .FORCE
$(MAKE) -C Cloogle compiler $(MAKE) -C Cloogle compiler
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
set -ev set -ev
PATCHCLEANBUILD="sed -i 's:clean-compiler-and-rts compiler itask:cstaps compiler master:' clean-base/linux-x64/git-sources.txt; sed -i 's:compiler-itask:compiler-master:' clean-base/linux-x64/build.sh" \ PATCHCLEANBUILD="sed -i 's:clean-compiler-and-rts compiler itask:cstaps compiler master:' clean-base/linux-x64/git-sources.txt; sed -i 's:compiler-itask:compiler-master:' clean-base/linux-x64/build.sh" \
install_clean.sh 'base lib-platform lib-tcpip' 2018-12-12 install_clean.sh 'base lib-platform lib-tcpip' 2018-12-14
PACKAGES="patch jq unzip z3" PACKAGES="patch jq unzip z3"
apt-get update -qq apt-get update -qq
......
...@@ -81,7 +81,9 @@ optionDescription = WithHelp True $ Options ...@@ -81,7 +81,9 @@ optionDescription = WithHelp True $ Options
Start :: *World -> *World Start :: *World -> *World
Start w Start w
# ([prog:args], w) = getCommandLine w # (prog,args,w) = case getCommandLine w of
([prog:args],w) -> (prog,args,w)
_ -> abort "getCommandLine returned 0 elements\n"
# opts = parseOptions optionDescription args zero # opts = parseOptions optionDescription args zero
| isError opts | isError opts
# err = stderr <<< 'Text'.join "\n" (fromError opts) <<< "\n" # err = stderr <<< 'Text'.join "\n" (fromError opts) <<< "\n"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment