@@ -33,7 +33,7 @@
3333 $:
3434 tables=$~([(malt ~[[0 *table]]) 1] (objects table))
3535 global-env=table
36− local-envs=$~(~[(malt ~[['_ENV' table+[0 ~]]])] (lest (map name value)))
36+ local-envs=$~(~[(malt ~[['_ENV' table+[0 ~]]])] (list (map name value)))
3737 ==
3838++ eval-m
3939 |$ [val]
@@ -59,10 +59,8 @@
5959 |= state
6060 [st ~]
6161++ eval-blok
62− =<
6362 |= =blok
6463 ^- (eval-m value)
65− %- with-local
6664 =/ body body.blok
6765 |-
6866 ^- (eval-m value)
@@ -70,36 +68,9 @@
7068 ?~ ret.blok (pure nil+~)
7169 ?~ u.ret.blok (pure nil+~)
7270 ;< rets=(lest value) bind (eval-exprlist u.u.ret.blok)
73− (pure (multires rets))
71+ (pure multires+rets)
7472 ;< ~ bind (eval-stat i.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
73+ $(body t.body)
10374++ eval-exprlist
10475 |= vals=exprlist
10576 ^- (eval-m (lest value))
@@ -125,31 +96,15 @@
12596 (set-table ->-.i.asmnts (~(put by tabl) ->+.i.asmnts +.i.asmnts))
12697 ==
12798 $(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)
14499 ==
145100++ set-var
146101 |= var=name
147102 |= val=value
148103 ^- (eval-m ~)
149104 ;< envs=(list (map name value)) bind get-local-envs
150− =/ new-envs=(unit (lest (map name value)))
105+ =/ new-envs=(unit (list (map name value)))
151106 |-
152− ^- (unit (lest (map name value)))
107+ ^- (unit (list (map name value)))
153108 ?~ envs ~
154109 ?. (~(has by i.envs) var)
155110 =/ rest $(envs t.envs)
@@ -172,7 +127,7 @@
172127 |= vals=(list value)
173128 ^- (list value)
174129 ?~ vals ~
175− ?~ t.vals ~[(normalize-multires i.vals)]
130+ ?~ t.vals ~[(normalize-multires)]
176131 [i.vals $(vals t.vals)]
177132++ normalize-multires
178133 |= val=value
@@ -186,7 +141,6 @@
186141 =/ tail=value (normalize-multires i.vals)
187142 ?: ?=(%multires -.tail) +.tail [tail ~]
188143 [i.vals $(vals t.vals)]
189− ?~ t.res i.res
190144 multires+res
191145 ==
192146++ process-varlist