toplevel.kl in shen-ruby-0.5.0

- old
+ new
@@ -49,90 +49,91 @@
 *****************************************************************************************
 "(defun shen.shen () (do (shen.credits) (shen.loop)))
 
 (defun shen.loop () (do (shen.initialise_environment) (do (shen.prompt) (do (trap-error (shen.read-evaluate-print) (lambda E (pr (error-to-string E) (stoutput)))) (shen.loop)))))
 
-(defun version (V2244) (set *version* V2244))
+(defun version (V2308) (set *version* V2308))
 
-(version "version 9.1")
+(version "version 11")
 
-(defun shen.credits () (do (pr "
+(defun shen.credits () (do (shen.prhush "
 Shen 2010, copyright (C) 2010 Mark Tarver
-" (stoutput)) (do (pr (cn "www.shenlanguage.org, " (shen.app (value *version*) "
-" shen.a)) (stoutput)) (do (pr (cn "running under " (shen.app (value *language*) (cn ", implementation: " (shen.app (value *implementation*) "" shen.a)) shen.a)) (stoutput)) (pr (cn "
+" (stoutput)) (do (shen.prhush "released under the Shen license
+" (stoutput)) (do (shen.prhush (cn "www.shenlanguage.org, " (shen.app (value *version*) "
+" shen.a)) (stoutput)) (do (shen.prhush (cn "running under " (shen.app (value *language*) (cn ", implementation: " (shen.app (value *implementation*) "" shen.a)) shen.a)) (stoutput)) (shen.prhush (cn "
 port " (shen.app (value *port*) (cn " ported by " (shen.app (value *porters*) "
-" shen.a)) shen.a)) (stoutput))))))
+" shen.a)) shen.a)) (stoutput)))))))
 
 (defun shen.initialise_environment () (shen.multiple-set (cons shen.*call* (cons 0 (cons shen.*infs* (cons 0 (cons shen.*process-counter* (cons 0 (cons shen.*catch* (cons 0 ()))))))))))
 
-(defun shen.multiple-set (V2245) (cond ((= () V2245) ()) ((and (cons? V2245) (cons? (tl V2245))) (do (set (hd V2245) (hd (tl V2245))) (shen.multiple-set (tl (tl V2245))))) (true (shen.sys-error shen.multiple-set))))
+(defun shen.multiple-set (V2309) (cond ((= () V2309) ()) ((and (cons? V2309) (cons? (tl V2309))) (do (set (hd V2309) (hd (tl V2309))) (shen.multiple-set (tl (tl V2309))))) (true (shen.sys-error shen.multiple-set))))
 
-(defun destroy (V2246) (declare V2246 ()))
+(defun destroy (V2310) (declare V2310 ()))
 
 (set shen.*history* ())
 
 (defun shen.read-evaluate-print () (let Lineread (shen.toplineread) (let History (value shen.*history*) (let NewLineread (shen.retrieve-from-history-if-needed Lineread History) (let NewHistory (shen.update_history NewLineread History) (let Parsed (fst NewLineread) (shen.toplevel Parsed)))))))
 
-(defun shen.retrieve-from-history-if-needed (V2256 V2257) (cond ((and (tuple? V2256) (and (cons? (snd V2256)) (and (cons? (tl (snd V2256))) (and (= () (tl (tl (snd V2256)))) (and (cons? V2257) (and (= (hd (snd V2256)) (shen.exclamation)) (= (hd (tl (snd V2256))) (shen.exclamation)))))))) (let PastPrint (shen.prbytes (snd (hd V2257))) (hd V2257))) ((and (tuple? V2256) (and (cons? (snd V2256)) (= (hd (snd V2256)) (shen.exclamation)))) (let Key? (shen.make-key (tl (snd V2256)) V2257) (let Find (head (shen.find-past-inputs Key? V2257)) (let PastPrint (shen.prbytes (snd Find)) Find)))) ((and (tuple? V2256) (and (cons? (snd V2256)) (and (= () (tl (snd V2256))) (= (hd (snd V2256)) (shen.percent))))) (do (shen.print-past-inputs (lambda X true) (reverse V2257) 0) (abort))) ((and (tuple? V2256) (and (cons? (snd V2256)) (= (hd (snd V2256)) (shen.percent)))) (let Key? (shen.make-key (tl (snd V2256)) V2257) (let Pastprint (shen.print-past-inputs Key? (reverse V2257) 0) (abort)))) (true V2256)))
+(defun shen.retrieve-from-history-if-needed (V2320 V2321) (cond ((and (tuple? V2320) (and (cons? (snd V2320)) (and (cons? (tl (snd V2320))) (and (= () (tl (tl (snd V2320)))) (and (cons? V2321) (and (= (hd (snd V2320)) (shen.exclamation)) (= (hd (tl (snd V2320))) (shen.exclamation)))))))) (let PastPrint (shen.prbytes (snd (hd V2321))) (hd V2321))) ((and (tuple? V2320) (and (cons? (snd V2320)) (= (hd (snd V2320)) (shen.exclamation)))) (let Key? (shen.make-key (tl (snd V2320)) V2321) (let Find (head (shen.find-past-inputs Key? V2321)) (let PastPrint (shen.prbytes (snd Find)) Find)))) ((and (tuple? V2320) (and (cons? (snd V2320)) (and (= () (tl (snd V2320))) (= (hd (snd V2320)) (shen.percent))))) (do (shen.print-past-inputs (lambda X true) (reverse V2321) 0) (abort))) ((and (tuple? V2320) (and (cons? (snd V2320)) (= (hd (snd V2320)) (shen.percent)))) (let Key? (shen.make-key (tl (snd V2320)) V2321) (let Pastprint (shen.print-past-inputs Key? (reverse V2321) 0) (abort)))) (true V2320)))
 
 (defun shen.percent () 37)
 
 (defun shen.exclamation () 33)
 
-(defun shen.prbytes (V2258) (do (map (lambda Byte (pr (n->string Byte) (stoutput))) V2258) (nl 1)))
+(defun shen.prbytes (V2322) (do (map (lambda Byte (pr (n->string Byte) (stoutput))) V2322) (nl 1)))
 
-(defun shen.update_history (V2259 V2260) (set shen.*history* (cons V2259 V2260)))
+(defun shen.update_history (V2323 V2324) (set shen.*history* (cons V2323 V2324)))
 
 (defun shen.toplineread () (shen.toplineread_loop (read-byte (stinput)) ()))
 
-(defun shen.toplineread_loop (V2262 V2263) (cond ((= V2262 (shen.hat)) (simple-error "line read aborted")) ((element? V2262 (cons (shen.newline) (cons (shen.carriage-return) ()))) (let Line (compile shen.<st_input> V2263 (lambda E shen.nextline)) (if (or (= Line shen.nextline) (empty? Line)) (shen.toplineread_loop (read-byte (stinput)) (append V2263 (cons V2262 ()))) (@p Line V2263)))) (true (shen.toplineread_loop (read-byte (stinput)) (append V2263 (cons V2262 ()))))))
+(defun shen.toplineread_loop (V2326 V2327) (cond ((= V2326 (shen.hat)) (simple-error "line read aborted")) ((element? V2326 (cons (shen.newline) (cons (shen.carriage-return) ()))) (let Line (compile shen.<st_input> V2327 (lambda E shen.nextline)) (if (or (= Line shen.nextline) (empty? Line)) (shen.toplineread_loop (read-byte (stinput)) (append V2327 (cons V2326 ()))) (@p Line V2327)))) (true (shen.toplineread_loop (read-byte (stinput)) (append V2327 (cons V2326 ()))))))
 
 (defun shen.hat () 94)
 
 (defun shen.newline () 10)
 
 (defun shen.carriage-return () 13)
 
-(defun tc (V2268) (cond ((= + V2268) (set shen.*tc* true)) ((= - V2268) (set shen.*tc* false)) (true (simple-error "tc expects a + or -"))))
+(defun tc (V2332) (cond ((= + V2332) (set shen.*tc* true)) ((= - V2332) (set shen.*tc* false)) (true (simple-error "tc expects a + or -"))))
 
-(defun shen.prompt () (if (value shen.*tc*) (pr (cn "
+(defun shen.prompt () (if (value shen.*tc*) (shen.prhush (cn "
 
-(" (shen.app (length (value shen.*history*)) "+) " shen.a)) (stoutput)) (pr (cn "
+(" (shen.app (length (value shen.*history*)) "+) " shen.a)) (stoutput)) (shen.prhush (cn "
 
 (" (shen.app (length (value shen.*history*)) "-) " shen.a)) (stoutput))))
 
-(defun shen.toplevel (V2269) (shen.toplevel_evaluate V2269 (value shen.*tc*)))
+(defun shen.toplevel (V2333) (shen.toplevel_evaluate V2333 (value shen.*tc*)))
 
-(defun shen.find-past-inputs (V2270 V2271) (let F (shen.find V2270 V2271) (if (empty? F) (simple-error "input not found
+(defun shen.find-past-inputs (V2334 V2335) (let F (shen.find V2334 V2335) (if (empty? F) (simple-error "input not found
 ") F)))
 
-(defun shen.make-key (V2272 V2273) (let Atom (hd (compile shen.<st_input> V2272 (lambda E (if (cons? E) (simple-error (cn "parse error here: " (shen.app E "
+(defun shen.make-key (V2336 V2337) (let Atom (hd (compile shen.<st_input> V2336 (lambda E (if (cons? E) (simple-error (cn "parse error here: " (shen.app E "
 " shen.s))) (simple-error "parse error
-"))))) (if (integer? Atom) (lambda X (= X (nth (+ Atom 1) (reverse V2273)))) (lambda X (shen.prefix? V2272 (shen.trim-gubbins (snd X)))))))
+"))))) (if (integer? Atom) (lambda X (= X (nth (+ Atom 1) (reverse V2337)))) (lambda X (shen.prefix? V2336 (shen.trim-gubbins (snd X)))))))
 
-(defun shen.trim-gubbins (V2274) (cond ((and (cons? V2274) (= (hd V2274) (shen.space))) (shen.trim-gubbins (tl V2274))) ((and (cons? V2274) (= (hd V2274) (shen.newline))) (shen.trim-gubbins (tl V2274))) ((and (cons? V2274) (= (hd V2274) (shen.carriage-return))) (shen.trim-gubbins (tl V2274))) ((and (cons? V2274) (= (hd V2274) (shen.tab))) (shen.trim-gubbins (tl V2274))) ((and (cons? V2274) (= (hd V2274) (shen.left-round))) (shen.trim-gubbins (tl V2274))) (true V2274)))
+(defun shen.trim-gubbins (V2338) (cond ((and (cons? V2338) (= (hd V2338) (shen.space))) (shen.trim-gubbins (tl V2338))) ((and (cons? V2338) (= (hd V2338) (shen.newline))) (shen.trim-gubbins (tl V2338))) ((and (cons? V2338) (= (hd V2338) (shen.carriage-return))) (shen.trim-gubbins (tl V2338))) ((and (cons? V2338) (= (hd V2338) (shen.tab))) (shen.trim-gubbins (tl V2338))) ((and (cons? V2338) (= (hd V2338) (shen.left-round))) (shen.trim-gubbins (tl V2338))) (true V2338)))
 
 (defun shen.space () 32)
 
 (defun shen.tab () 9)
 
 (defun shen.left-round () 40)
 
-(defun shen.find (V2281 V2282) (cond ((= () V2282) ()) ((and (cons? V2282) (V2281 (hd V2282))) (cons (hd V2282) (shen.find V2281 (tl V2282)))) ((cons? V2282) (shen.find V2281 (tl V2282))) (true (shen.sys-error shen.find))))
+(defun shen.find (V2345 V2346) (cond ((= () V2346) ()) ((and (cons? V2346) (V2345 (hd V2346))) (cons (hd V2346) (shen.find V2345 (tl V2346)))) ((cons? V2346) (shen.find V2345 (tl V2346))) (true (shen.sys-error shen.find))))
 
-(defun shen.prefix? (V2293 V2294) (cond ((= () V2293) true) ((and (cons? V2293) (and (cons? V2294) (= (hd V2294) (hd V2293)))) (shen.prefix? (tl V2293) (tl V2294))) (true false)))
+(defun shen.prefix? (V2357 V2358) (cond ((= () V2357) true) ((and (cons? V2357) (and (cons? V2358) (= (hd V2358) (hd V2357)))) (shen.prefix? (tl V2357) (tl V2358))) (true false)))
 
-(defun shen.print-past-inputs (V2304 V2305 V2306) (cond ((= () V2305) _) ((and (cons? V2305) (not (V2304 (hd V2305)))) (shen.print-past-inputs V2304 (tl V2305) (+ V2306 1))) ((and (cons? V2305) (tuple? (hd V2305))) (do (pr (shen.app V2306 ". " shen.a) (stoutput)) (do (shen.prbytes (snd (hd V2305))) (shen.print-past-inputs V2304 (tl V2305) (+ V2306 1))))) (true (shen.sys-error shen.print-past-inputs))))
+(defun shen.print-past-inputs (V2368 V2369 V2370) (cond ((= () V2369) _) ((and (cons? V2369) (not (V2368 (hd V2369)))) (shen.print-past-inputs V2368 (tl V2369) (+ V2370 1))) ((and (cons? V2369) (tuple? (hd V2369))) (do (shen.prhush (shen.app V2370 ". " shen.a) (stoutput)) (do (shen.prbytes (snd (hd V2369))) (shen.print-past-inputs V2368 (tl V2369) (+ V2370 1))))) (true (shen.sys-error shen.print-past-inputs))))
 
-(defun shen.toplevel_evaluate (V2307 V2308) (cond ((and (cons? V2307) (and (cons? (tl V2307)) (and (= : (hd (tl V2307))) (and (cons? (tl (tl V2307))) (and (= () (tl (tl (tl V2307)))) (= true V2308)))))) (shen.typecheck-and-evaluate (hd V2307) (hd (tl (tl V2307))))) ((and (cons? V2307) (cons? (tl V2307))) (do (shen.toplevel_evaluate (cons (hd V2307) ()) V2308) (do (nl 1) (shen.toplevel_evaluate (tl V2307) V2308)))) ((and (cons? V2307) (and (= () (tl V2307)) (= true V2308))) (shen.typecheck-and-evaluate (hd V2307) (gensym A))) ((and (cons? V2307) (and (= () (tl V2307)) (= false V2308))) (let Eval (shen.eval-without-macros (hd V2307)) (print Eval))) (true (shen.sys-error shen.toplevel_evaluate))))
+(defun shen.toplevel_evaluate (V2371 V2372) (cond ((and (cons? V2371) (and (cons? (tl V2371)) (and (= : (hd (tl V2371))) (and (cons? (tl (tl V2371))) (and (= () (tl (tl (tl V2371)))) (= true V2372)))))) (shen.typecheck-and-evaluate (hd V2371) (hd (tl (tl V2371))))) ((and (cons? V2371) (cons? (tl V2371))) (do (shen.toplevel_evaluate (cons (hd V2371) ()) V2372) (do (nl 1) (shen.toplevel_evaluate (tl V2371) V2372)))) ((and (cons? V2371) (and (= () (tl V2371)) (= true V2372))) (shen.typecheck-and-evaluate (hd V2371) (gensym A))) ((and (cons? V2371) (and (= () (tl V2371)) (= false V2372))) (let Eval (shen.eval-without-macros (hd V2371)) (print Eval))) (true (shen.sys-error shen.toplevel_evaluate))))
 
-(defun shen.typecheck-and-evaluate (V2309 V2310) (let Typecheck (shen.typecheck V2309 V2310) (if (= Typecheck false) (simple-error "type error
-") (let Eval (shen.eval-without-macros V2309) (let Type (shen.pretty-type Typecheck) (pr (shen.app Eval (cn " : " (shen.app Type "" shen.r)) shen.s) (stoutput)))))))
+(defun shen.typecheck-and-evaluate (V2373 V2374) (let Typecheck (shen.typecheck V2373 V2374) (if (= Typecheck false) (simple-error "type error
+") (let Eval (shen.eval-without-macros V2373) (let Type (shen.pretty-type Typecheck) (shen.prhush (shen.app Eval (cn " : " (shen.app Type "" shen.r)) shen.s) (stoutput)))))))
 
-(defun shen.pretty-type (V2311) (shen.mult_subst (value shen.*alphabet*) (shen.extract-pvars V2311) V2311))
+(defun shen.pretty-type (V2375) (shen.mult_subst (value shen.*alphabet*) (shen.extract-pvars V2375) V2375))
 
-(defun shen.extract-pvars (V2316) (cond ((shen.pvar? V2316) (cons V2316 ())) ((cons? V2316) (union (shen.extract-pvars (hd V2316)) (shen.extract-pvars (tl V2316)))) (true ())))
+(defun shen.extract-pvars (V2380) (cond ((shen.pvar? V2380) (cons V2380 ())) ((cons? V2380) (union (shen.extract-pvars (hd V2380)) (shen.extract-pvars (tl V2380)))) (true ())))
 
-(defun shen.mult_subst (V2321 V2322 V2323) (cond ((= () V2321) V2323) ((= () V2322) V2323) ((and (cons? V2321) (cons? V2322)) (shen.mult_subst (tl V2321) (tl V2322) (subst (hd V2321) (hd V2322) V2323))) (true (shen.sys-error shen.mult_subst))))
+(defun shen.mult_subst (V2385 V2386 V2387) (cond ((= () V2385) V2387) ((= () V2386) V2387) ((and (cons? V2385) (cons? V2386)) (shen.mult_subst (tl V2385) (tl V2386) (subst (hd V2385) (hd V2386) V2387))) (true (shen.sys-error shen.mult_subst))))
 
 
 