Skip to content
This repository was archived by the owner on Nov 1, 2018. It is now read-only.

Commit ffd3703

Browse files
atzedijkstraatzedijkstra
committed
rename of CHR related files to directory CtxtRedOnly, in prep for CHR based type system
1 parent 357a94f commit ffd3703

23 files changed

+55
-31
lines changed

‎EHC/configure

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -731,6 +731,7 @@ arCmd
731731
RANLIB_CMD
732732
ranlibCmd
733733
cppCmd
734+
ENABLE_CHRTYSYS
734735
ENABLE_SANDBOX
735736
ENABLE_TAUPHI
736737
ENABLE_CORESYSF
@@ -818,6 +819,7 @@ enable_corerun_asinpoutp
818819
enable_coresysf
819820
enable_tauphi
820821
enable_sandbox
822+
enable_chrtysys
821823
with_cpp
822824
with_aspects
823825
with_build_suffix
@@ -1477,6 +1479,7 @@ Optional Features:
14771479
--enable-coresysf include System F type generation for Core
14781480
--enable-tauphi include TauPhi language extension and analyses
14791481
--enable-sandbox build EHC/UHC libs with cabal sandbox
1482+
--enable-chrtysys build EHC/UHC with CHR based type system
14801483
14811484
Optional Packages:
14821485
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -3168,6 +3171,17 @@ fi
31683171
ENABLE_SANDBOX=$enableSandbox
31693172
31703173
3174+
### enable options: turn on CHR based type system impl
3175+
# Check whether --enable-chrtysys was given.
3176+
if test "${enable_chrtysys+set}" = set; then :
3177+
enableval=$enable_chrtysys; enableChrTySys=yes
3178+
else
3179+
enableChrTySys=no
3180+
fi
3181+
3182+
ENABLE_CHRTYSYS=$enableChrTySys
3183+
3184+
31713185
### cpp
31723186
31733187
# Check whether --with-cpp was given.

‎EHC/configure.ac

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,10 @@ AC_SUBST(ENABLE_TAUPHI,$enableTauPhi)
186186
AC_ARG_ENABLE(sandbox, AS_HELP_STRING([--enable-sandbox],[build EHC/UHC libs with cabal sandbox]), [enableSandbox=yes], [enableSandbox=no])
187187
AC_SUBST(ENABLE_SANDBOX,$enableSandbox)
188188

189+
### enable options: turn on CHR based type system impl
190+
AC_ARG_ENABLE(chrtysys, AS_HELP_STRING([--enable-chrtysys],[build EHC/UHC with CHR based type system]), [enableChrTySys=yes], [enableChrTySys=no])
191+
AC_SUBST(ENABLE_CHRTYSYS,$enableChrTySys)
192+
189193
### cpp
190194
AC_ARG_WITH(cpp,
191195
[AS_HELP_STRING([--with-cpp=<cpp preprocessor>],[Use a command different from 'cpp' to compile with CPP.])],

‎EHC/mk/config.mk.in

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,11 @@ ifeq (@ENABLE_SANDBOX@,yes)
9999
ENABLE_SANDBOX := yes
100100
endif
101101

102+
# include CHR based type system
103+
ifeq (@ENABLE_CHRTYSYS@,yes)
104+
ENABLE_CHRTYSYS := yes
105+
endif
106+
102107
# include java code generation
103108
ifeq (@ENABLE_JAVA@,yes)
104109
ENABLE_JAVA := yes

‎EHC/src/ehc/CHR/Constraint.chs renamed to ‎EHC/src/ehc/CHR/CtxtRedOnly/Constraint.chs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
%%% Constraint Handling Rules: Constraint language
77
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
88

9-
%%[(9 hmtyinfer || hmtyast) module {%{EH}CHR.Constraint}
9+
%%[(9 hmtyinfer || hmtyast) module {%{EH}CHR.CtxtRedOnly.Constraint}
1010
%%]
1111

12-
%%[(9 hmtyinfer || hmtyast) import({%{EH}Base.Common},{%{EH}Ty},UHC.Util.CHR,{%{EH}CHR.Key},UHC.Util.TreeTrie,{%{EH}Substitutable})
12+
%%[(9 hmtyinfer || hmtyast) import({%{EH}Base.Common},{%{EH}Ty},UHC.Util.CHR,{%{EH}CHR.CtxtRedOnly.Key},UHC.Util.TreeTrie,{%{EH}Substitutable})
1313
%%]
1414

1515
%%[(9 hmtyinfer || hmtyast) import(UHC.Util.Pretty as PP, UHC.Util.Utils)

‎EHC/src/ehc/CHR/Guard.chs renamed to ‎EHC/src/ehc/CHR/CtxtRedOnly/Guard.chs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
Derived from work by Gerrit vd Geest.
66

7-
%%[(9 hmtyinfer) module {%{EH}CHR.Guard} import(UHC.Util.CHR,{%{EH}CHR.Key})
7+
%%[(9 hmtyinfer) module {%{EH}CHR.CtxtRedOnly.Guard} import(UHC.Util.CHR,{%{EH}CHR.CtxtRedOnly.Key})
88
%%]
99

10-
%%[(9999 hmtyinfer) import({%{EH}CHR.Constraint}) export(module {%{EH}CHR.Constraint})
10+
%%[(9999 hmtyinfer) import({%{EH}CHR.CtxtRedOnly.Constraint}) export(module {%{EH}CHR.CtxtRedOnly.Constraint})
1111
%%]
1212

1313
%%[(9999 hmtyinfer) import(qualified Data.Map as Map,qualified Data.Set as Set,Data.Maybe)

‎EHC/src/ehc/CHR/Instances.chs renamed to ‎EHC/src/ehc/CHR/CtxtRedOnly/Instances.chs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
Derived from work by Gerrit vd Geest.
66

7-
%%[(9 hmtyinfer) module {%{EH}CHR.Instances} import(UHC.Util.CHR,{%{EH}CHR.Key})
7+
%%[(9 hmtyinfer) module {%{EH}CHR.CtxtRedOnly.Instances} import(UHC.Util.CHR,{%{EH}CHR.CtxtRedOnly.Key})
88
%%]
99

10-
%%[(9 hmtyinfer) import({%{EH}CHR.Constraint}, {%{EH}CHR.Guard}) export(module {%{EH}CHR.Constraint}, module {%{EH}CHR.Guard})
10+
%%[(9 hmtyinfer) import({%{EH}CHR.CtxtRedOnly.Constraint}, {%{EH}CHR.CtxtRedOnly.Guard}) export(module {%{EH}CHR.CtxtRedOnly.Constraint}, module {%{EH}CHR.CtxtRedOnly.Guard})
1111
%%]
1212

1313
%%[(9 hmtyinfer) import(qualified Data.Map as Map,qualified Data.Set as Set,Data.Maybe)

‎EHC/src/ehc/CHR/Key.chs renamed to ‎EHC/src/ehc/CHR/CtxtRedOnly/Key.chs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
%%% Constraint Handling Rules: Key to be used as part of TrieKey
33
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
44

5-
%%[9 module {%{EH}CHR.Key} import({%{EH}Base.Common},UHC.Util.TreeTrie)
5+
%%[9 module {%{EH}CHR.CtxtRedOnly.Key} import({%{EH}Base.Common},UHC.Util.TreeTrie)
66
%%]
77

88
%%[9 import(UHC.Util.Pretty, UHC.Util.Utils)

‎EHC/src/ehc/CHR/Solve.chs renamed to ‎EHC/src/ehc/CHR/CtxtRedOnly/Solve.chs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Assumptions (to be documented further)
88
- The key [Trie.TrieKey Key] used to lookup a constraint in a CHR should be distinguishing enough to be used for the prevention
99
of the application of a propagation rule for a 2nd time.
1010

11-
%%[(9 hmtyinfer) module {%{EH}CHR.Solve}
11+
%%[(9 hmtyinfer) module {%{EH}CHR.CtxtRedOnly.Solve}
1212
%%]
1313

1414
%%[(9 hmtyinfer) import(qualified Data.Set as Set)
@@ -17,7 +17,7 @@ Assumptions (to be documented further)
1717
%%[(9 hmtyinfer) import(UHC.Util.Utils, UHC.Util.CHR, UHC.Util.CHR.Rule, UHC.Util.Substitutable) export(module UHC.Util.CHR.Rule)
1818
%%]
1919

20-
%%[(9 hmtyinfer) import({%{EH}CHR.Instances}, {%{EH}CHR.Key}, {%{EH}VarMp}, {%{EH}Ty}, {%{EH}Ty.FitsInCommon2})
20+
%%[(9 hmtyinfer) import({%{EH}CHR.CtxtRedOnly.Instances}, {%{EH}CHR.CtxtRedOnly.Key}, {%{EH}VarMp}, {%{EH}Ty}, {%{EH}Ty.FitsInCommon2})
2121
%%]
2222

2323
%%[(9 hmtyinfer) import(UHC.Util.CHR.Solve.TreeTrie.Mono hiding(IsCHRSolvable(..), SolveState, SolveTrace, SolveStep, CHRStore), qualified UHC.Util.CHR.Solve.TreeTrie.Mono as Mono) export(module UHC.Util.CHR.Solve.TreeTrie.Mono, IsCHRSolvable(..), SolveState, SolveTrace, SolveStep, CHRStore', CHRSolverConstraint)

‎EHC/src/ehc/EH/MainAG.cag

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@
9999
%%[(9 hmtyinfer) hs import({%{EH}Ty.Trf.MergePreds},{%{EH}Ty.Trf.Canonic})
100100
%%]
101101

102-
%%[(9 hmtyinfer) hs import({%{EH}Gam.ClGam},{%{EH}Pred},{%{EH}Pred.RedGraph}(redPruneReductionsUntil),UHC.Util.CHR,{%{EH}CHR.Constraint},{%{EH}CHR.Guard},{%{EH}Pred.ToCHR},{%{EH}Pred.Heuristics},{%{EH}Pred.Evidence},{%{EH}CHR.Solve})
102+
%%[(9 hmtyinfer) hs import({%{EH}Gam.ClGam},{%{EH}Pred},{%{EH}Pred.CtxtRedOnly.RedGraph}(redPruneReductionsUntil),UHC.Util.CHR,{%{EH}CHR.CtxtRedOnly.Constraint},{%{EH}CHR.CtxtRedOnly.Guard},{%{EH}Pred.CtxtRedOnly.ToCHR},{%{EH}Pred.CtxtRedOnly.Heuristics},{%{EH}Pred.CtxtRedOnly.Evidence},{%{EH}CHR.CtxtRedOnly.Solve})
103103
%%]
104104

105-
%%[(9 codegen) hs import({%{EH}Pred.EvidenceToCore})
105+
%%[(9 codegen) hs import({%{EH}Pred.CtxtRedOnly.EvidenceToCore})
106106
%%]
107107
%%[(9 hmtyinfer) hs import ({%{EH}Gam.ClassDefaultGam})
108108
%%]

‎EHC/src/ehc/EHC/BuildFunction/Run.chs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Running of BuildFunction
9191
%%]
9292

9393
-- CHR solver
94-
%%[(50 hmtyinfer) import({%{EH}CHR.Solve}(chrStoreUnion))
94+
%%[(50 hmtyinfer) import({%{EH}CHR.CtxtRedOnly.Solve}(chrStoreUnion))
9595
%%]
9696

9797
-- HS semantics

‎EHC/src/ehc/EHC/CompilePhase/FlowBetweenPhase.chs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ XXX
5959
%%]
6060

6161
-- CHR solver
62-
%%[(50 hmtyinfer) import({%{EH}CHR.Solve}(chrStoreUnion))
62+
%%[(50 hmtyinfer) import({%{EH}CHR.CtxtRedOnly.Solve}(chrStoreUnion))
6363
%%]
6464

6565
-- Force evaluation for IO

‎EHC/src/ehc/EHC/InitialSetup.chs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Initial values
4848
%%]
4949

5050
-- CHR solver
51-
%%[(50 hmtyinfer) import({%{EH}Pred.ToCHR}(initCHRStore))
51+
%%[(50 hmtyinfer) import({%{EH}Pred.CtxtRedOnly.ToCHR}(initCHRStore))
5252
%%]
5353

5454
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

‎EHC/src/ehc/HI.chs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
%%[50 hs import({%{EH}Config},{%{EH}Module.ImportExport})
3333
%%]
3434

35-
%%[(50 hmtyinfer) hs import({%{EH}Pred.ToCHR},{%{EH}CHR.Solve},qualified {%{EH}Gam.ClGam} as Pr)
35+
%%[(50 hmtyinfer) hs import({%{EH}Pred.CtxtRedOnly.ToCHR},{%{EH}CHR.CtxtRedOnly.Solve},qualified {%{EH}Gam.ClGam} as Pr)
3636
%%]
3737

3838
%%[50 hs import(qualified Data.Set as Set,qualified Data.Map as Map,qualified UHC.Util.Rel as Rel,qualified UHC.Util.FastSeq as Seq,UHC.Util.Utils)

‎EHC/src/ehc/Pred/Evidence.chs renamed to ‎EHC/src/ehc/Pred/CtxtRedOnly/Evidence.chs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
Derived from work by Gerrit vd Geest.
66

7-
%%[(9 hmtyinfer) module {%{EH}Pred.Evidence}
7+
%%[(9 hmtyinfer) module {%{EH}Pred.CtxtRedOnly.Evidence}
88
%%]
99

10-
%%[(9 hmtyinfer) import(UHC.Util.CHR, {%{EH}Substitutable}, {%{EH}Ty}, {%{EH}VarMp}, {%{EH}CHR.Constraint})
10+
%%[(9 hmtyinfer) import(UHC.Util.CHR, {%{EH}Substitutable}, {%{EH}Ty}, {%{EH}VarMp}, {%{EH}CHR.CtxtRedOnly.Constraint})
1111
%%]
1212

1313
%%[(9 hmtyinfer) import({%{EH}Base.Common})

‎EHC/src/ehc/Pred/EvidenceToCore.chs renamed to ‎EHC/src/ehc/Pred/CtxtRedOnly/EvidenceToCore.chs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
%%% Translation of Evidence (of Pred) to Core fragments
33
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
44

5-
%%[(9 codegen) module {%{EH}Pred.EvidenceToCore} import({%{EH}Pred.Evidence},{%{EH}CHR.Constraint})
5+
%%[(9 codegen) module {%{EH}Pred.CtxtRedOnly.EvidenceToCore} import({%{EH}Pred.CtxtRedOnly.Evidence},{%{EH}CHR.CtxtRedOnly.Constraint})
66
%%]
77

88
%%[(9 codegen) import(Data.List,qualified Data.Set as Set,qualified Data.Map as Map,Data.Maybe)

‎EHC/src/ehc/Pred/Heuristics.chs renamed to ‎EHC/src/ehc/Pred/CtxtRedOnly/Heuristics.chs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
Derived from work by Gerrit vd Geest.
66

7-
%%[(9 hmtyinfer) module {%{EH}Pred.Heuristics}
7+
%%[(9 hmtyinfer) module {%{EH}Pred.CtxtRedOnly.Heuristics}
88
%%]
99

10-
%%[(9 hmtyinfer) import({%{EH}Ty},{%{EH}Ty.FitsInCommon2}, UHC.Util.CHR,{%{EH}VarMp},{%{EH}Pred.Evidence},{%{EH}CHR.Key},{%{EH}CHR.Constraint},{%{EH}CHR.Guard},{%{EH}CHR.Solve})
10+
%%[(9 hmtyinfer) import({%{EH}Ty},{%{EH}Ty.FitsInCommon2}, UHC.Util.CHR,{%{EH}VarMp},{%{EH}Pred.CtxtRedOnly.Evidence},{%{EH}CHR.CtxtRedOnly.Key},{%{EH}CHR.CtxtRedOnly.Constraint},{%{EH}CHR.CtxtRedOnly.Guard},{%{EH}CHR.CtxtRedOnly.Solve})
1111
%%]
1212

1313
%%[(9 hmtyinfer) import({%{EH}Base.Common})

‎EHC/src/ehc/Pred/RedGraph.chs renamed to ‎EHC/src/ehc/Pred/CtxtRedOnly/RedGraph.chs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
Derived from work by Gerrit vd Geest.
66

7-
%%[(9 hmtyinfer) module {%{EH}Pred.RedGraph} import({%{EH}Base.Common},{%{EH}Ty},{%{EH}VarMp}, Data.Maybe)
7+
%%[(9 hmtyinfer) module {%{EH}Pred.CtxtRedOnly.RedGraph} import({%{EH}Base.Common},{%{EH}Ty},{%{EH}VarMp}, Data.Maybe)
88
%%]
99

10-
%%[(9 hmtyinfer) import({%{EH}CHR.Constraint},{%{EH}CHR.Constraint})
10+
%%[(9 hmtyinfer) import({%{EH}CHR.CtxtRedOnly.Constraint},{%{EH}CHR.CtxtRedOnly.Constraint})
1111
%%]
1212

13-
%%[(9 hmtyinfer) import({%{EH}Pred.Heuristics})
13+
%%[(9 hmtyinfer) import({%{EH}Pred.CtxtRedOnly.Heuristics})
1414
%%]
1515

1616
%%[(9 hmtyinfer) import(qualified Data.Map as Map, qualified Data.Set as Set)

‎EHC/src/ehc/Pred/ToCHR.chs renamed to ‎EHC/src/ehc/Pred/CtxtRedOnly/ToCHR.chs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ Derived from work by Gerrit vd Geest.
66

77
Conversion from Pred to CHR.
88

9-
%%[(9 hmtyinfer) module {%{EH}Pred.ToCHR} import({%{EH}Opts},{%{EH}Base.Common},{%{EH}Base.TermLike},{%{EH}Ty},{%{EH}Ty.Ftv},{%{EH}Error},{%{EH}VarMp},{%{EH}Substitutable})
9+
%%[(9 hmtyinfer) module {%{EH}Pred.CtxtRedOnly.ToCHR} import({%{EH}Opts},{%{EH}Base.Common},{%{EH}Base.TermLike},{%{EH}Ty},{%{EH}Ty.Ftv},{%{EH}Error},{%{EH}VarMp},{%{EH}Substitutable})
1010
%%]
1111

1212
%%[(9 hmtyinfer) import(Data.Maybe,qualified Data.Set as Set,qualified Data.Map as Map)
1313
%%]
1414

15-
%%[(9 hmtyinfer) import(UHC.Util.CHR,{%{EH}CHR.Constraint},{%{EH}CHR.Guard},{%{EH}CHR.Solve},{%{EH}CHR.Key})
15+
%%[(9 hmtyinfer) import(UHC.Util.CHR,{%{EH}CHR.CtxtRedOnly.Constraint},{%{EH}CHR.CtxtRedOnly.Guard},{%{EH}CHR.CtxtRedOnly.Solve},{%{EH}CHR.CtxtRedOnly.Key})
1616
%%]
1717

18-
%%[(9 hmtyinfer) import({%{EH}Pred.Heuristics},{%{EH}Pred.Evidence},{%{EH}Pred.RedGraph})
18+
%%[(9 hmtyinfer) import({%{EH}Pred.CtxtRedOnly.Heuristics},{%{EH}Pred.CtxtRedOnly.Evidence},{%{EH}Pred.CtxtRedOnly.RedGraph})
1919
%%]
2020

2121
%%[(9 hmtyinfer) import({%{EH}Ty.FitsInCommon2}, {%{EH}Ty.Trf.Canonic})

‎EHC/src/ehc/Ty/FitsIn.chs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
%%]
5555
%%[(9 codegen coreout hmtyinfer) import({%{EH}Core.Pretty})
5656
%%]
57-
%%[(9 hmtyinfer) import({%{EH}CHR.Constraint})
57+
%%[(9 hmtyinfer) import({%{EH}CHR.CtxtRedOnly.Constraint})
5858
%%]
5959
%%[(9 hmtyinfer) export(fitsIn')
6060
%%]

‎EHC/src/ehc/Ty/FitsInCommon.chs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
%%[(7 hmtyinfer) import(qualified Data.Set as Set)
2929
%%]
3030

31-
%%[(9 hmtyinfer) import({%{EH}CHR.Constraint})
31+
%%[(9 hmtyinfer) import({%{EH}CHR.CtxtRedOnly.Constraint})
3232
%%]
3333

3434
%%[(9 codegen hmtyinfer) import({%{EH}Core},{%{EH}Core.Coercion},{%{EH}Core.Subst})

‎EHC/src/ehc/Ty/TreeTrieKey.cag

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ In this way search via a TreeTrie proceeds breadth first top to bottom.
1515
%%[(9 hmtyinfer || hmtyast) hs module {%{EH}Ty.TreeTrieKey} import({%{EH}Base.Common},{%{EH}Base.TermLike},{%{EH}Base.HsName},{%{EH}Base.HsName.Builtin},{%{EH}Ty})
1616
%%]
1717

18-
%%[(9 hmtyinfer || hmtyast) hs import(qualified Data.Set as Set,Data.List as Lst,UHC.Util.FastSeq as Seq,UHC.Util.TreeTrie,{%{EH}CHR.Key})
18+
%%[(9 hmtyinfer || hmtyast) hs import(qualified Data.Set as Set,Data.List as Lst,UHC.Util.FastSeq as Seq,UHC.Util.TreeTrie,{%{EH}CHR.CtxtRedOnly.Key})
1919
%%]
2020

2121
%%[(9 hmtyinfer || hmtyast) hs import(UHC.Util.CHR.Key)

‎EHC/src/ehc/files1.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ EHC_HS_UTIL_SRC_CHS_DFLT := $(patsubst %,$(SRC_EHC_PREFIX)%.chs,\
6666
FinalEnv Substitutable Opts Gam VarMp VarLookup Deriving Generics NameAspect DerivationTree Pred HI LamInfo AbstractCore \
6767
Config ConfigInternalVersions ConfigCabal Paths_uhc_light \
6868
$(addprefix EH/,Main) \
69-
$(addprefix CHR/,Key Constraint Guard Solve Instances) \
69+
$(addprefix CHR/CtxtRedOnly/,Key Constraint Guard Solve Instances) \
7070
$(addprefix AbstractCore/,Utils) \
7171
$(addprefix AnaDomain/,Utils) \
7272
$(addprefix VarMp/,Utils) \
7373
$(addprefix Opts/,Base CommandLine) \
74-
$(addprefix Pred/,ToCHR Evidence EvidenceToCore Heuristics RedGraph) \
74+
$(addprefix Pred/CtxtRedOnly/,ToCHR Evidence EvidenceToCore Heuristics RedGraph) \
7575
$(addprefix Base/,UnderDev Trace Range TermLike UID Parser Parser2 Pragma Strictness Target Fld Common HsName Debug CfgPP LaTeX HtmlCommon FileSearchLocation PackageDatabase ParseUtils Optimize) \
7676
$(addprefix Base/HsName/,Builtin) \
7777
$(addprefix Scanner/,Common Machine Scanner Token TokenParser) \

‎EHC/src/ehc/variant.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ EHC_ASPECTS := $(strip $(sort $(if $(ASPECTS),$(ASPECTS) \
1717
$(if $(ENABLE_JAVA),java jazy,) \
1818
$(if $(ENABLE_LLVM),llvm,) \
1919
$(if $(ENABLE_CMM),cmm,) \
20+
$(if $(ENABLE_CHRTYSYS),chrtysys,) \
2021
$(if $(ENABLE_JS),javascript,) \
2122
$(if $(ENABLE_CORESYSF),coresysf,) \
2223
$(if $(ENABLE_CORE_ASINPOUTP),corebackend corerun,) \

0 commit comments

Comments
 (0)