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

Commit a1a85e5

Browse files
atzedijkstraatzedijkstra
committed
refactorization of flow of datatype info (dataGam) and function info (lamMp) into separate toplevel statestructure, independent of backend usage
1 parent a81d583 commit a1a85e5

File tree

10 files changed

+107
-63
lines changed

10 files changed

+107
-63
lines changed

‎EHC/configure

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -687,6 +687,7 @@ CFLAGS
687687
CC
688688
GCC_CMD
689689
gccCmd
690+
RULER_EXISTS
690691
RULER_CMD
691692
rulerCmd
692693
SHUFFLE_CMD
@@ -4298,6 +4299,8 @@ else
42984299
fi
42994300
RULER_CMD=$rulerCmd
43004301
4302+
RULER_EXISTS=$rulerExists
4303+
43014304
43024305
# gcc
43034306

‎EHC/configure.ac

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -636,6 +636,7 @@ else
636636
rulerExists="no"
637637
fi
638638
AC_SUBST(RULER_CMD,$rulerCmd)
639+
AC_SUBST(RULER_EXISTS,$rulerExists)
639640

640641
# gcc
641642
AC_ARG_WITH(gcc,

‎EHC/mk/shared.mk.in

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,14 @@ SHELL_FILTER_NONEMP_FILES := $(BINABS_PREFIX)filterOutEmptyFiles
262262
SHELL_AGDEPEND := $(BINABS_PREFIX)agdepend
263263
TAR := @TAR_CMD@
264264

265+
#tool existence
266+
ifeq (@RULER_EXISTS@,yes)
267+
RULER_EXISTS := yes
268+
else
269+
# just leave empty
270+
RULER_EXISTS :=
271+
endif
272+
265273
# lhs2TeX
266274
LHS2TEX_ENV := $(LHS2TEX)
267275
LHS2TEX_CMD := LHS2TEX=".$(PATHS_SEP)../../$(FMT_SRC_PREFIX)$(PATHS_SEP)$(LHS2TEX_ENV)" lhs2TeX

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

Lines changed: 38 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,12 @@ bcall bfun = do
206206
return $ \crsi ->
207207
let opts = crsi ^. crsiOpts
208208
ehInh = crsi ^. crsiEHInh
209+
cenv = crsi ^. crsiCEnv
210+
cenv' = cenvDataGam ^$= (EHSem.gathDataGam_Syn_AGItf ehSem `gamUnion`) $ cenv
209211
ehInh' = ehInh
210212
%%[[(50 hmtyinfer)
211-
{ EHSem.dataGam_Inh_AGItf = EHSem.gathDataGam_Syn_AGItf ehSem `gamUnion` EHSem.dataGam_Inh_AGItf ehInh
213+
{ -- EHSem.dataGam_Inh_AGItf = EHSem.gathDataGam_Syn_AGItf ehSem `gamUnion` EHSem.dataGam_Inh_AGItf ehInh
214+
EHSem.dataGam_Inh_AGItf = cenv' ^. cenvDataGam
212215
, EHSem.valGam_Inh_AGItf = EHSem.gathValGam_Syn_AGItf ehSem `gamUnion` EHSem.valGam_Inh_AGItf ehInh
213216
, EHSem.tyGam_Inh_AGItf = EHSem.gathTyGam_Syn_AGItf ehSem `gamUnion` EHSem.tyGam_Inh_AGItf ehInh
214217
, EHSem.tyKiGam_Inh_AGItf = EHSem.gathTyKiGam_Syn_AGItf ehSem `gamUnion` EHSem.tyKiGam_Inh_AGItf ehInh
@@ -221,7 +224,7 @@ bcall bfun = do
221224
%%]]
222225
in -- From: cpFlowEHSem1
223226
( ( crsiEHInh ^= ehInh' )
224-
. ( (crsiCEnv ^* cenvDataGam) ^$= (EHSem.gathDataGam_Syn_AGItf ehSem `gamUnion`) )
227+
. ( crsiCEnv ^= cenv' )
225228
) $ crsi
226229

227230
%%[[(50 core corein)
@@ -234,14 +237,17 @@ bcall bfun = do
234237
bcall $ FoldCoreModPlMb modSearchKey pl
235238
) (return id) $ \_ (coreChkSem, _, _, _, _, _) -> do
236239
-- 20151008 AD: TBD: dataGam needs independent passing around
237-
return ( ( crsiCEnv ^* cenvDataGam ^$= (`gamUnion` Core2ChkSem.gathDataGam_Syn_CodeAGItf coreChkSem)
238-
)
240+
return $ \crsi ->
241+
let cenv = cenvDataGam ^$= (`gamUnion` Core2ChkSem.gathDataGam_Syn_CodeAGItf coreChkSem) $ crsi ^. crsiCEnv
242+
in ( ( crsiCEnv ^= cenv )
239243
%%[[(50 grin)
240-
. ( crsiCoreInh ^$= \coreInh ->
241-
coreInh
242-
{ Core2GrSem.dataGam_Inh_CodeAGItf = Core2GrSem.dataGam_Inh_CodeAGItf coreInh `gamUnion` Core2ChkSem.gathDataGam_Syn_CodeAGItf coreChkSem }
244+
. ( crsiCoreInh ^$= \coreInh ->
245+
coreInh
246+
-- { Core2GrSem.dataGam_Inh_CodeAGItf = Core2GrSem.dataGam_Inh_CodeAGItf coreInh `gamUnion` Core2ChkSem.gathDataGam_Syn_CodeAGItf coreChkSem }
247+
{Core2GrSem.dataGam_Inh_CodeAGItf = cenv ^. cenvDataGam}
243248
%%]]
244-
) )
249+
) )
250+
$ crsi
245251
%%][50
246252
let updCoreSrc = id
247253
%%]]
@@ -271,13 +277,17 @@ bcall bfun = do
271277
cpTrPP TraceOn_BldFlow ["ASTSemFlowStage_BetweenModule astpMbFromCoreToGrin" >#< modSearchKey, pp pl]
272278
bcall $ FoldCore2GrinPlMb bglob modSearchKey pl
273279
) (return id) $ \_ core2GrinSem -> do
274-
return $ ( (crsiCEnv ^* cenvLamMp) ^$= (Core2GrSem.gathLamMp_Syn_CodeAGItf core2GrinSem `lamMpUnionBindAspMp`) )
275-
%%[[50
276-
. ( crsiCoreInh ^$= \coreInh ->
277-
-- assumption: old info can safely be overridden, otherwise merge should be done here
278-
coreInh { Core2GrSem.lamMp_Inh_CodeAGItf = Core2GrSem.gathLamMp_Syn_CodeAGItf core2GrinSem `lamMpUnionBindAspMp` Core2GrSem.lamMp_Inh_CodeAGItf coreInh }
279-
)
280-
%%]]
280+
return $ \crsi ->
281+
let cenv = cenvLamMp ^$= (Core2GrSem.gathLamMp_Syn_CodeAGItf core2GrinSem `lamMpUnionBindAspMp`) $ crsi ^. crsiCEnv
282+
in ( ( crsiCEnv ^= cenv )
283+
. ( crsiCoreInh ^$= \coreInh ->
284+
coreInh
285+
-- assumption: old info can safely be overridden, otherwise merge should be done here
286+
-- { Core2GrSem.lamMp_Inh_CodeAGItf = Core2GrSem.gathLamMp_Syn_CodeAGItf core2GrinSem `lamMpUnionBindAspMp` Core2GrSem.lamMp_Inh_CodeAGItf coreInh }
287+
{ Core2GrSem.lamMp_Inh_CodeAGItf = cenv ^. cenvLamMp }
288+
) )
289+
$ crsi
290+
281291
%%][50
282292
let updCoreGrin = id
283293
%%]]
@@ -404,24 +414,24 @@ bcall bfun = do
404414
bcall $ FoldEHPlMb bglob modSearchKey pl
405415
) (return ()) $ \_ ehSem -> do
406416
cpUpdSI $ \crsi ->
407-
let ehInh = crsi ^. crsiEHInh
408-
coreInh= crsi ^. crsiCoreInh
409-
cenv = crsi ^. crsiCEnv
410-
coreInh' = coreInh
411-
%%[[8
412-
{ Core2GrSem.dataGam_Inh_CodeAGItf = EHSem.gathDataGam_Syn_AGItf ehSem
413-
, Core2GrSem.lamMp_Inh_CodeAGItf = lm
414-
%%][50
415-
{ Core2GrSem.dataGam_Inh_CodeAGItf = EHSem.dataGam_Inh_AGItf ehInh
416-
, Core2GrSem.lamMp_Inh_CodeAGItf = lm `lamMpUnionBindAspMp` Core2GrSem.lamMp_Inh_CodeAGItf coreInh -- assumption: no duplicates, otherwise merging as done later has to be done
417-
%%]]
418-
}
417+
let ehInh = crsi ^. crsiEHInh
418+
coreInh = crsi ^. crsiCoreInh
419+
cenv = crsi ^. crsiCEnv
419420
lm = EHSem.gathLamMp_Syn_AGItf ehSem
420421
cenv' = ( cenvDataGam ^$= (EHSem.gathDataGam_Syn_AGItf ehSem `gamUnion`) )
421422
%%[[(8 core)
422423
. ( cenvLamMp ^$= (EHSem.gathLamMp_Syn_AGItf ehSem `lamMpUnionBindAspMp`) ) -- assumption: no duplicates, otherwise merging as done later has to be done
423424
%%]]
424425
$ cenv
426+
coreInh' = coreInh
427+
%%[[8
428+
{ Core2GrSem.dataGam_Inh_CodeAGItf = cenv' ^. cenvDataGam -- EHSem.gathDataGam_Syn_AGItf ehSem
429+
, Core2GrSem.lamMp_Inh_CodeAGItf = cenv' ^. cenvLamMp -- lm
430+
%%][50
431+
{ Core2GrSem.dataGam_Inh_CodeAGItf = cenv' ^. cenvDataGam -- EHSem.dataGam_Inh_AGItf ehInh
432+
, Core2GrSem.lamMp_Inh_CodeAGItf = cenv' ^. cenvLamMp -- lm `lamMpUnionBindAspMp` Core2GrSem.lamMp_Inh_CodeAGItf coreInh -- assumption: no duplicates, otherwise merging as done later has to be done
433+
%%]]
434+
}
425435
in crsi -- From: cpFlowEHSem1
426436
{ _crsiCoreInh = coreInh', _crsiCEnv = cenv' }
427437
%%]]
@@ -977,7 +987,7 @@ ecuIsHSNewerThanHI ecu
977987
]
978988
, mieimplHsName2FldMp = expNmFldMp
979989
%%[[(50 grin)
980-
, mieimplLamMp = Core2GrSem.lamMp_Inh_CodeAGItf $ _crsiCoreInh crsi
990+
, mieimplLamMp = crsi ^. crsiCEnv ^. cenvLamMp -- Core2GrSem.lamMp_Inh_CodeAGItf $ _crsiCoreInh crsi
981991
%%]]
982992
}
983993

@@ -1171,7 +1181,6 @@ ecuIsHSNewerThanHI ecu
11711181
let inh = Core2ChkSem.Inh_CodeAGItf
11721182
{ Core2ChkSem.opts_Inh_CodeAGItf = opts
11731183
, Core2ChkSem.moduleNm_Inh_CodeAGItf = modNm
1174-
-- , Core2ChkSem.dataGam_Inh_CodeAGItf = EHSem.dataGam_Inh_AGItf $ crsi ^. crsiEHInh
11751184
}
11761185
coreSem = Core2ChkSem.cmodCheck' inh core
11771186
hasMain = Core2ChkSem.hasMain_Syn_CodeAGItf coreSem

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ Translation to another AST
88
%%]
99

1010
-- general imports
11-
%%[(50 codegen) import(qualified Data.Map as Map, qualified Data.Set as Set, qualified UHC.Util.FastSeq as Seq)
11+
%%[(50 codegen) import(qualified Data.Map as Map, qualified Data.Set as Set)
12+
%%]
13+
%%[(50 codegen) import(UHC.Util.Lens, qualified UHC.Util.FastSeq as Seq)
1214
%%]
1315
%%[(50 codegen) import(Control.Monad.State)
1416
%%]
@@ -67,7 +69,7 @@ cpGenModuleImportExportImpl modNm
6769
]
6870
, mieimplHsName2FldMp = expNmFldMp
6971
%%[[(50 grin)
70-
, mieimplLamMp = Core2GrSem.lamMp_Inh_CodeAGItf $ _crsiCoreInh crsi
72+
, mieimplLamMp = crsi ^. crsiCEnv ^. cenvLamMp -- Core2GrSem.lamMp_Inh_CodeAGItf $ _crsiCoreInh crsi
7173
%%]]
7274
}
7375
}

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

Lines changed: 35 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,15 @@ cpFlowEHSem1 modNm
178178
= mentrelToFilterMp' False [modNm] (mmiExps mmi)
179179
%%]]
180180
usedImpS = mentrelFilterMpModuleNames mentrelFilterMp
181+
cenv' = ( cenvDataGam ^$= (dg `gamUnionFlow`) )
182+
%%[[(8 core)
183+
. ( cenvLamMp ^$= (lm `lamMpUnionBindAspMp`) ) -- assumption: no duplicates, otherwise merging as done later has to be done
184+
%%]]
185+
$ cenv
181186
ehInh' = ehInh
182187
%%[[(50 hmtyinfer)
183-
{ EHSem.dataGam_Inh_AGItf = dg `gamUnionFlow` EHSem.dataGam_Inh_AGItf ehInh
188+
{ -- EHSem.dataGam_Inh_AGItf = dg `gamUnionFlow` EHSem.dataGam_Inh_AGItf ehInh
189+
EHSem.dataGam_Inh_AGItf = cenv' ^. cenvDataGam
184190
, EHSem.valGam_Inh_AGItf = vg `gamUnionFlow` EHSem.valGam_Inh_AGItf ehInh
185191
, EHSem.tyGam_Inh_AGItf = tg `gamUnionFlow` EHSem.tyGam_Inh_AGItf ehInh
186192
, EHSem.tyKiGam_Inh_AGItf = tkg `gamUnionFlow` EHSem.tyKiGam_Inh_AGItf ehInh
@@ -210,19 +216,14 @@ cpFlowEHSem1 modNm
210216
%%]]
211217
}
212218
%%]]
213-
cenv' = ( cenvDataGam ^$= (dg `gamUnionFlow`) )
214-
%%[[(8 core)
215-
. ( cenvLamMp ^$= (lm `lamMpUnionBindAspMp`) ) -- assumption: no duplicates, otherwise merging as done later has to be done
216-
%%]]
217-
$ cenv
218219
%%[[(8 core grin)
219220
coreInh' = coreInh
220221
%%[[8
221-
{ Core2GrSem.dataGam_Inh_CodeAGItf = EHSem.gathDataGam_Syn_AGItf ehSem
222-
, Core2GrSem.lamMp_Inh_CodeAGItf = EHSem.gathLamMp_Syn_AGItf ehSem
222+
{ Core2GrSem.dataGam_Inh_CodeAGItf = cenv' ^. cenvDataGam -- EHSem.gathDataGam_Syn_AGItf ehSem
223+
, Core2GrSem.lamMp_Inh_CodeAGItf = cenv' ^. cenvLamMp -- EHSem.gathLamMp_Syn_AGItf ehSem
223224
%%][50
224-
{ Core2GrSem.dataGam_Inh_CodeAGItf = EHSem.dataGam_Inh_AGItf ehInh'
225-
, Core2GrSem.lamMp_Inh_CodeAGItf = lm `lamMpUnionBindAspMp` Core2GrSem.lamMp_Inh_CodeAGItf coreInh -- assumption: no duplicates, otherwise merging as done later has to be done
225+
{ Core2GrSem.dataGam_Inh_CodeAGItf = cenv' ^. cenvDataGam -- EHSem.dataGam_Inh_AGItf ehInh'
226+
, Core2GrSem.lamMp_Inh_CodeAGItf = cenv' ^. cenvLamMp -- lm `lamMpUnionBindAspMp` Core2GrSem.lamMp_Inh_CodeAGItf coreInh -- assumption: no duplicates, otherwise merging as done later has to be done
226227
%%]]
227228
}
228229
%%]]
@@ -266,14 +267,20 @@ cpFlowHISem modNm
266267
hiInfo = panicJust "cpFlowHISem.hiInfo" $ _ecuMbPrevHIInfo ecu
267268
ehInh = crsi ^. crsiEHInh
268269
cenv = crsi ^. crsiCEnv
270+
cenv' = ( cenvDataGam ^$= (HI.hiiDataGam hiInfo `gamUnionFlow`) )
271+
%%[[(50 core)
272+
. ( cenvLamMp ^$= (HI.hiiLamMp hiInfo `lamMpUnionBindAspMp`) )
273+
%%]]
274+
$ cenv
269275
%%[[50
270276
ehInh' = ehInh
271277
%%[[(50 hmtyinfer)
272278
{ EHSem.valGam_Inh_AGItf = (HI.hiiValGam hiInfo) `gamUnionFlow` EHSem.valGam_Inh_AGItf ehInh
273279
, EHSem.tyGam_Inh_AGItf = (HI.hiiTyGam hiInfo) `gamUnionFlow` EHSem.tyGam_Inh_AGItf ehInh
274280
, EHSem.tyKiGam_Inh_AGItf = (HI.hiiTyKiGam hiInfo) `gamUnionFlow` EHSem.tyKiGam_Inh_AGItf ehInh
275281
, EHSem.polGam_Inh_AGItf = (HI.hiiPolGam hiInfo) `gamUnionFlow` EHSem.polGam_Inh_AGItf ehInh
276-
, EHSem.dataGam_Inh_AGItf = (HI.hiiDataGam hiInfo) `gamUnionFlow` EHSem.dataGam_Inh_AGItf ehInh
282+
-- , EHSem.dataGam_Inh_AGItf = (HI.hiiDataGam hiInfo) `gamUnionFlow` EHSem.dataGam_Inh_AGItf ehInh
283+
, EHSem.dataGam_Inh_AGItf = cenv' ^. cenvDataGam
277284
, EHSem.clGam_Inh_AGItf = (HI.hiiClGam hiInfo) `gamUnionFlow` EHSem.clGam_Inh_AGItf ehInh
278285
, EHSem.clDfGam_Inh_AGItf = (HI.hiiClDfGam hiInfo) `gamUnionFlow` EHSem.clDfGam_Inh_AGItf ehInh
279286
, EHSem.chrStore_Inh_AGItf = (HI.hiiCHRStore hiInfo) `chrStoreUnion` EHSem.chrStore_Inh_AGItf ehInh
@@ -285,15 +292,11 @@ cpFlowHISem modNm
285292
{ HSSem.fixityGam_Inh_AGItf = (HI.hiiFixityGam hiInfo) `gamUnionFlow` HSSem.fixityGam_Inh_AGItf hsInh
286293
, HSSem.idGam_Inh_AGItf = (HI.hiiIdDefOccGam hiInfo) `gamUnionFlow` HSSem.idGam_Inh_AGItf hsInh
287294
}
288-
cenv' = ( cenvDataGam ^$= (HI.hiiDataGam hiInfo `gamUnionFlow`) )
289-
%%[[(8 core)
290-
. ( cenvLamMp ^$= (HI.hiiLamMp hiInfo `lamMpUnionBindAspMp`) )
291-
%%]]
292-
$ cenv
293295
%%[[(50 core grin)
294296
coreInh = crsi ^. crsiCoreInh
295297
coreInh' = coreInh
296-
{ Core2GrSem.lamMp_Inh_CodeAGItf = (HI.hiiLamMp hiInfo) `lamMpUnionBindAspMp` Core2GrSem.lamMp_Inh_CodeAGItf coreInh
298+
{ -- Core2GrSem.lamMp_Inh_CodeAGItf = (HI.hiiLamMp hiInfo) `lamMpUnionBindAspMp` Core2GrSem.lamMp_Inh_CodeAGItf coreInh
299+
Core2GrSem.lamMp_Inh_CodeAGItf = cenv' ^. cenvLamMp
297300
}
298301
%%]]
299302
optim = crsiOptim crsi
@@ -328,13 +331,15 @@ cpFlowCoreModSem modNm
328331
-- 20151008 AD: TBD: dataGam should be passed independently of Core etc.
329332
; when (isJust mbCoreModSem) $ do
330333
{ let coreModSem = fromJust mbCoreModSem
334+
cenv = cenvDataGam ^$= (`gamUnionFlow` Core2ChkSem.gathDataGam_Syn_CodeAGItf coreModSem) $ crsi ^. crsiCEnv
331335
%%[[(50 grin)
332-
coreInh' = coreInh
333-
{ Core2GrSem.dataGam_Inh_CodeAGItf = Core2GrSem.dataGam_Inh_CodeAGItf coreInh `gamUnionFlow` Core2ChkSem.gathDataGam_Syn_CodeAGItf coreModSem
336+
coreInh' = coreInh
337+
{ -- Core2GrSem.dataGam_Inh_CodeAGItf = Core2GrSem.dataGam_Inh_CodeAGItf coreInh `gamUnionFlow` Core2ChkSem.gathDataGam_Syn_CodeAGItf coreModSem
338+
Core2GrSem.dataGam_Inh_CodeAGItf = cenv ^. cenvDataGam
334339
}
335340
%%]]
336341
; cpUpdSI $
337-
( (crsiCEnv ^* cenvDataGam) ^$= (`gamUnionFlow` Core2ChkSem.gathDataGam_Syn_CodeAGItf coreModSem) )
342+
( crsiCEnv ^= cenv )
338343
%%[[(50 grin)
339344
. ( crsiCoreInh ^= coreInh' )
340345
%%]]
@@ -351,19 +356,21 @@ cpFlowCoreSemAfterFold modNm
351356
; let (ecu,crsi,opts,_) = crBaseInfo modNm cr
352357
coreSem = panicJust "cpFlowCoreSemAfterFold.coreSem" $ _ecuMbCoreSem ecu
353358
lm = prepFlow $! Core2GrSem.gathLamMp_Syn_CodeAGItf coreSem
359+
cenv = cenvLamMp ^$= (lm `lamMpUnionBindAspMp`) $ crsi ^. crsiCEnv -- assumption: old info can be overridden, otherwise merge should be done here
354360
%%[[50
355361
coreInh = crsi ^. crsiCoreInh
356362
hii = ecu ^. ecuHIInfo
357363
coreInh' = coreInh
358-
{ Core2GrSem.lamMp_Inh_CodeAGItf = lm `lamMpUnionBindAspMp` Core2GrSem.lamMp_Inh_CodeAGItf coreInh -- assumption: old info can be overridden, otherwise merge should be done here
364+
{ -- Core2GrSem.lamMp_Inh_CodeAGItf = lm `lamMpUnionBindAspMp` Core2GrSem.lamMp_Inh_CodeAGItf coreInh -- assumption: old info can be overridden, otherwise merge should be done here
365+
Core2GrSem.lamMp_Inh_CodeAGItf = cenv ^. cenvLamMp
359366
}
360367
hii' = hii
361368
{ HI.hiiLamMp = lm
362369
}
363370
%%]]
364371
; when (isJust (_ecuMbCoreSem ecu))
365372
(do { cpUpdSI $
366-
( (crsiCEnv ^* cenvLamMp) ^$= (lm `lamMpUnionBindAspMp`) ) -- assumption: old info can be overridden, otherwise merge should be done here
373+
( crsiCEnv ^= cenv )
367374
%%[[50
368375
. ( crsiCoreInh ^= coreInh')
369376
; cpUpdCU modNm ( ecuStoreHIInfo hii'
@@ -413,13 +420,17 @@ cpFlowHILamMp modNm
413420
%%[[(50 grin)
414421
coreInh = crsi ^. crsiCoreInh
415422
%%]]
423+
cenv = cenvLamMp ^$= (HI.hiiLamMp hii `lamMpUnionBindAspMp`) $ crsi ^. crsiCEnv -- assumption: old info can be overridden, otherwise merge should be done here
416424
hii = ecu ^. ecuHIInfo
417425

418426
-- put back result: call info map (lambda arity, ...), overwriting previous entries
419427
; cpUpdSI $
420-
( (crsiCEnv ^* cenvLamMp) ^$= (HI.hiiLamMp hii `lamMpUnionBindAspMp`) )
428+
( crsiCEnv ^= cenv )
421429
%%[[(50 grin)
422-
. ( crsiCoreInh ^= coreInh {Core2GrSem.lamMp_Inh_CodeAGItf = HI.hiiLamMp hii `lamMpUnionBindAspMp` Core2GrSem.lamMp_Inh_CodeAGItf coreInh} )
430+
. ( crsiCoreInh ^= coreInh
431+
-- { Core2GrSem.lamMp_Inh_CodeAGItf = HI.hiiLamMp hii `lamMpUnionBindAspMp` Core2GrSem.lamMp_Inh_CodeAGItf coreInh }
432+
{ Core2GrSem.lamMp_Inh_CodeAGItf = cenv ^. cenvLamMp }
433+
)
423434
%%]]
424435
}
425436
%%]

0 commit comments

Comments
 (0)