| リビジョン | d02940e3c2cb96a3e0299dd701f114a55431be2c (tree) |
|---|---|
| 日時 | 2019-01-31 21:59:48 |
| 作者 | Agustina Arzille <avarzille@rise...> |
| コミッター | Agustina Arzille |
Fix multiple let bindings
compiler.cpp (diff)| @@ -2074,7 +2074,7 @@ | ||
| 2074 | 2074 | |
| 2075 | 2075 | for (int i = 0; i < ap->len; ++i) |
| 2076 | 2076 | { |
| 2077 | - if (nksymbol_p (ap->data[i])) | |
| 2077 | + if (symbol_p (ap->data[i])) | |
| 2078 | 2078 | ++ret; |
| 2079 | 2079 | else if (array_p (ap->data[i])) |
| 2080 | 2080 | ret += array_nbindings (interp, ap->data[i]); |
| @@ -2133,7 +2133,7 @@ | ||
| 2133 | 2133 | else |
| 2134 | 2134 | for (object tmp = bindings; tmp != NIL; ) |
| 2135 | 2135 | { |
| 2136 | - if (!nksymbol_p (xcar (tmp)) && !array_p (tmp)) | |
| 2136 | + if (!nksymbol_p (xcar (tmp)) && !array_p (xcar (tmp))) | |
| 2137 | 2137 | bc.interp->raise2 ("arg-error", io_sprintf (bc.interp, |
| 2138 | 2138 | "let: invalid binding: %Q", xcar (tmp))); |
| 2139 | 2139 |
| @@ -2162,13 +2162,20 @@ | ||
| 2162 | 2162 | ret += flatten_array_args (bc, syms + ret, ap->data[i]); |
| 2163 | 2163 | else |
| 2164 | 2164 | { |
| 2165 | - if (special_symbol_p (ap->data[i])) | |
| 2165 | + object tmp = ap->data[i]; | |
| 2166 | + | |
| 2167 | + if (special_symbol_p (tmp)) | |
| 2166 | 2168 | { |
| 2167 | 2169 | bc.emit (OPX_(LOADNIL)); |
| 2168 | - bc.emit (OPX_(BIND), ap->data[i]); | |
| 2170 | + bc.emit (OPX_(BIND), tmp); | |
| 2169 | 2171 | } |
| 2170 | - | |
| 2171 | - syms[ret].car = ap->data[i]; | |
| 2172 | + else if (keyword_p (tmp)) | |
| 2173 | + { | |
| 2174 | + tmp = intern (bc.interp, as_str (symname (tmp))); | |
| 2175 | + bc.interp->push (tmp); | |
| 2176 | + } | |
| 2177 | + | |
| 2178 | + syms[ret].car = tmp; | |
| 2172 | 2179 | syms[ret].cdr = syms[ret + 1].as_obj (); |
| 2173 | 2180 | ++ret; |
| 2174 | 2181 | } |
Fork