@@ -33,7 +33,7 @@
3333 $:
3434 tables=$~([(malt ~[[0 *table]]) 1] (objects table))
3535 global-env=table
36− local-envs=$~(~[(malt ~[['_ENV' table+[0 ~]]])] (list (map name value)))
36+ local-envs=$~(~[(malt ~[['_ENV' table+[0 ~]]])] (lest (map name value)))
3737 ==
3838++ eval-m
3939 |$ [val]
@@ -59,8 +59,10 @@
5959 |= state
6060 [st ~]
6161++ eval-blok
62+ =<
6263 |= =blok
6364 ^- (eval-m value)
65+ %- with-local
6466 =/ body body.blok
6567 |-
6668 ^- (eval-m value)
@@ -68,9 +70,36 @@
6870 ?~ ret.blok (pure nil+~)
6971 ?~ u.ret.blok (pure nil+~)
7072 ;< rets=(lest value) bind (eval-exprlist u.u.ret.blok)
71− (pure multires+rets)
73+ (pure (multires rets))
7274 ;< ~ bind (eval-stat i.body)
73− $(body t.body)
75+ ;< ret=value bind $(body t.body)
76+ (pure ret)
77+ |%
78+ ++ with-local
79+ |* act=(eval-m)
80+ ^- _act
81+ ;< ~ bind push-local
82+ ;< res=_val:$:act bind act
83+ ;< ~ bind pop-local
84+ (pure res)
85+ ++ push-local
86+ ^- (eval-m ~)
87+ |= st=state
88+ =. local-envs.st [*(map name value) local-envs.st]
89+ [st ~]
90+ ++ pop-local
91+ ^- (eval-m ~)
92+ |= st=state
93+ =. local-envs.st
94+ ?~ t.local-envs.st !!
95+ t.local-envs.st
96+ [st ~]
97+ --
98+++ multires
99+ |= vals=(lest value)
100+ ^- value
101+ ?~ t.vals i.vals
102+ multires+vals
74103++ eval-exprlist
75104 |= vals=exprlist
76105 ^- (eval-m (lest value))
@@ -96,15 +125,31 @@
96125 (set-table ->-.i.asmnts (~(put by tabl) ->+.i.asmnts +.i.asmnts))
97126 ==
98127 $(asmnts t.asmnts)
128+ %local-asmnt
129+ =/ lhs=(list name)
130+ %+ turn attrnamelist.stat
131+ |= [=name attr=(unit attrib)]
132+ ?> ?=(~ attr)
133+ name
134+ ;< actual-values=(list [name value]) bind
135+ ?~ rhs.stat (pure ~)
136+ ;< rhs=(list value) bind (eval-exprlist u.rhs.stat)
137+ (pure (zip lhs rhs))
138+ ;< st=state bind get-state
139+ =. i.local-envs.st
140+ %- ~(uni by i.local-envs.st)
141+ %- malt
142+ (weld (turn lhs |=(=name [name `value`nil+~])) actual-values)
143+ (set-state st)
99144 ==
100145++ set-var
101146 |= var=name
102147 |= val=value
103148 ^- (eval-m ~)
104149 ;< envs=(list (map name value)) bind get-local-envs
105− =/ new-envs=(unit (list (map name value)))
150+ =/ new-envs=(unit (lest (map name value)))
106151 |-
107− ^- (unit (list (map name value)))
152+ ^- (unit (lest (map name value)))
108153 ?~ envs ~
109154 ?. (~(has by i.envs) var)
110155 =/ rest $(envs t.envs)
@@ -141,6 +186,7 @@
141186 =/ tail=value (normalize-multires i.vals)
142187 ?: ?=(%multires -.tail) +.tail [tail ~]
143188 [i.vals $(vals t.vals)]
189+ ?~ t.res i.res
144190 multires+res
145191 ==
146192++ process-varlist