about summary refs log tree commit diff stats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/environment.mu4
-rw-r--r--shell/primitives.mu9
2 files changed, 3 insertions, 10 deletions
diff --git a/shell/environment.mu b/shell/environment.mu
index 688590dd..0816f41b 100644
--- a/shell/environment.mu
+++ b/shell/environment.mu
@@ -283,9 +283,7 @@ fn edit-environment _self: (addr environment), key: grapheme, data-disk: (addr d
         var global-data/eax: (addr array global) <- lookup *global-data-ah
         var curr-offset/ebx: (offset global) <- compute-offset global-data, curr-index
         var curr/ebx: (addr global) <- index global-data, curr-offset
-        var curr-value-ah/eax: (addr handle cell) <- get curr, value
-        var curr-value/eax: (addr cell) <- lookup *curr-value-ah
-        var primitive?/eax: boolean <- primitive? curr-value
+        var primitive?/eax: boolean <- primitive-global? curr
         compare primitive?, 0/false
         break-if-=
         var go-modal-error-ah/eax: (addr handle array byte) <- get self, go-modal-error
diff --git a/shell/primitives.mu b/shell/primitives.mu
index 66bc3786..b7f46a6e 100644
--- a/shell/primitives.mu
+++ b/shell/primitives.mu
@@ -179,13 +179,8 @@ fn primitive-global? _x: (addr global) -> _/eax: boolean {
     break-if-!=
     return 0/false
   }
-  {
-    var value-type/eax: (addr int) <- get value, type
-    compare *value-type, 4/primitive
-    break-if-=
-    return 0/false
-  }
-  return 1/true
+  var primitive?/eax: boolean <- primitive? value
+  return primitive?
 }
 
 fn append-primitive _self: (addr global-table), name: (addr array byte) {
5'>185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330