From b4d5b58959f9d416976910609f46733ee91bacb0 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Sun, 9 Oct 2016 00:24:24 -0700 Subject: 3491 Update the html, proving that commit 3490 worked. The only changes are from other recent commits. --- html/lambda-to-mu.mu.html | 120 +++++++++++++++++++++++----------------------- 1 file changed, 60 insertions(+), 60 deletions(-) (limited to 'html/lambda-to-mu.mu.html') diff --git a/html/lambda-to-mu.mu.html b/html/lambda-to-mu.mu.html index e591592b..52100115 100644 --- a/html/lambda-to-mu.mu.html +++ b/html/lambda-to-mu.mu.html @@ -83,14 +83,14 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color *result <- merge 1/tag:pair, a/first, b/rest ] -def is-atom? x:&:cell -> result:boolean [ +def is-atom? x:&:cell -> result:bool [ local-scope load-ingredients reply-unless x, 0/false _, result <- maybe-convert *x, atom:variant ] -def is-pair? x:&:cell -> result:boolean [ +def is-pair? x:&:cell -> result:bool [ local-scope load-ingredients reply-unless x, 0/false @@ -101,8 +101,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color local-scope s:text <- new [a] x:&:cell <- new-atom s - 10:boolean/raw <- is-atom? x - 11:boolean/raw <- is-pair? x + 10:bool/raw <- is-atom? x + 11:bool/raw <- is-pair? x memory-should-contain [ 10 <- 1 11 <- 0 @@ -115,18 +115,18 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color s:text <- new [a] x:&:cell <- new-atom s y:&:cell <- new-pair x, 0/nil - 10:boolean/raw <- is-atom? y - 11:boolean/raw <- is-pair? y + 10:bool/raw <- is-atom? y + 11:bool/raw <- is-pair? y memory-should-contain [ 10 <- 0 11 <- 1 ] ] -def atom-match? x:&:cell, pat:text -> result:boolean [ +def atom-match? x:&:cell, pat:text -> result:bool [ local-scope load-ingredients - s:text, is-atom?:boolean <- maybe-convert *x, atom:variant + s:text, is-atom?:bool <- maybe-convert *x, atom:variant reply-unless is-atom?, 0/false result <- equal pat, s ] @@ -134,7 +134,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color scenario atom-match [ local-scope x:&:cell <- new-atom [abc] - 10:boolean/raw <- atom-match? x, [abc] + 10:bool/raw <- atom-match? x, [abc] memory-should-contain [ 10 <- 1 ] @@ -143,7 +143,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color def first x:&:cell -> result:&:cell [ local-scope load-ingredients - pair:pair, pair?:boolean <- maybe-convert *x, pair:variant + pair:pair, pair?:bool <- maybe-convert *x, pair:variant reply-unless pair?, 0/nil result <- get pair, first:offset ] @@ -151,7 +151,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color def rest x:&:cell -> result:&:cell [ local-scope load-ingredients - pair:pair, pair?:boolean <- maybe-convert *x, pair:variant + pair:pair, pair?:bool <- maybe-convert *x, pair:variant reply-unless pair?, 0/nil result <- get pair, rest:offset ] @@ -159,7 +159,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color def set-first base:&:cell, new-first:&:cell -> base:&:cell [ local-scope load-ingredients - pair:pair, is-pair?:boolean <- maybe-convert *base, pair:variant + pair:pair, is-pair?:bool <- maybe-convert *base, pair:variant reply-unless is-pair? pair <- put pair, first:offset, new-first *base <- merge 1/pair, pair @@ -168,7 +168,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color def set-rest base:&:cell, new-rest:&:cell -> base:&:cell [ local-scope load-ingredients - pair:pair, is-pair?:boolean <- maybe-convert *base, pair:variant + pair:pair, is-pair?:bool <- maybe-convert *base, pair:variant reply-unless is-pair? pair <- put pair, rest:offset, new-rest *base <- merge 1/pair, pair @@ -193,7 +193,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color x:&:cell <- new-atom s y:&:cell <- new-pair x, 0/nil x2:&:cell <- first y - 10:boolean/raw <- equal x, x2 + 10:bool/raw <- equal x, x2 11:&:cell/raw <- rest y memory-should-contain [ 10 <- 1 # first is correct @@ -216,15 +216,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color load-ingredients # skip whitespace in <- skip-whitespace in - c:char, eof?:boolean <- peek in + c:char, eof?:bool <- peek in reply-if eof?, 0/nil - pair?:boolean <- equal c, 40/open-paren + pair?:bool <- equal c, 40/open-paren { break-if pair? # atom b:&:buffer <- new-buffer 30 { - done?:boolean <- end-of-stream? in + done?:bool <- end-of-stream? in break-if done? # stop before close paren or space c:char <- peek in @@ -246,11 +246,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color out <- new cell:type # start out with nil # read in first element of pair { - end?:boolean <- end-of-stream? in - not-end?:boolean <- not end? + end?:bool <- end-of-stream? in + not-end?:bool <- not end? assert not-end?, [unbalanced '(' in expression] c <- peek in - close-paren?:boolean <- equal c, 41/close-paren + close-paren?:bool <- equal c, 41/close-paren break-if close-paren? first:&:cell, in <- parse in *out <- merge 1/pair, first, 0/nil @@ -259,20 +259,20 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color curr:&:cell <- copy out { in <- skip-whitespace in - end?:boolean <- end-of-stream? in - not-end?:boolean <- not end? + end?:bool <- end-of-stream? in + not-end?:bool <- not end? assert not-end?, [unbalanced '(' in expression] # termination check: ')' c <- peek in { - close-paren?:boolean <- equal c, 41/close-paren + close-paren?:bool <- equal c, 41/close-paren break-unless close-paren? read in # skip ')' break +end-pair:label } # still here? read next element of pair next:&:cell, in <- parse in - is-dot?:boolean <- atom-match? next, [.] + is-dot?:bool <- atom-match? next, [.] { break-if is-dot? next-curr:&:cell <- new-pair next, 0/nil @@ -284,7 +284,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color # deal with dotted pair in <- skip-whitespace in c <- peek in - not-close-paren?:boolean <- not-equal c, 41/close-paren + not-close-paren?:bool <- not-equal c, 41/close-paren assert not-close-paren?, [')' cannot immediately follow '.'] final:&:cell <- parse in curr <- set-rest curr, final @@ -292,7 +292,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color # is going to end the pair in <- skip-whitespace in c <- peek in - close-paren?:boolean <- equal c, 41/close-paren + close-paren?:bool <- equal c, 41/close-paren assert close-paren?, ['.' must be followed by exactly one expression before ')'] } loop @@ -305,10 +305,10 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color local-scope load-ingredients { - done?:boolean <- end-of-stream? in + done?:bool <- end-of-stream? in reply-if done?, 0/null c:char <- peek in - space?:boolean <- space? c + space?:bool <- space? c break-unless space? read in # skip loop @@ -334,7 +334,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color } # base case: atom { - s:text, atom?:boolean <- maybe-convert *x, atom:variant + s:text, atom?:bool <- maybe-convert *x, atom:variant break-unless atom? buf <- append buf, s reply @@ -353,7 +353,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color local-scope s:text <- new [a] x:&:cell <- parse s - s2:text, 10:boolean/raw <- maybe-convert *x, atom:variant + s2:text, 10:bool/raw <- maybe-convert *x, atom:variant 11:@:char/raw <- copy *s2 memory-should-contain [ 10 <- 1 # parse result is an atom @@ -365,7 +365,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color local-scope s:text <- new [abc] x:&:cell <- parse s - s2:text, 10:boolean/raw <- maybe-convert *x, atom:variant + s2:text, 10:bool/raw <- maybe-convert *x, atom:variant 11:@:char/raw <- copy *s2 memory-should-contain [ 10 <- 1 # parse result is an atom @@ -380,13 +380,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color trace-should-contain [ app/parse: < abc | < def | <> > > ] - 10:boolean/raw <- is-pair? x + 10:bool/raw <- is-pair? x x1:&:cell <- first x x2:&:cell <- rest x - s1:text, 11:boolean/raw <- maybe-convert *x1, atom:variant - 12:boolean/raw <- is-pair? x2 + s1:text, 11:bool/raw <- maybe-convert *x1, atom:variant + 12:bool/raw <- is-pair? x2 x3:&:cell <- first x2 - s2:text, 13:boolean/raw <- maybe-convert *x3, atom:variant + s2:text, 13:bool/raw <- maybe-convert *x3, atom:variant 14:&:cell/raw <- rest x2 20:@:char/raw <- copy *s1 30:@:char/raw <- copy *s2 @@ -408,13 +408,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color trace-should-contain [ app/parse: < abc | < def | <> > > ] - 10:boolean/raw <- is-pair? x + 10:bool/raw <- is-pair? x x1:&:cell <- first x x2:&:cell <- rest x - s1:text, 11:boolean/raw <- maybe-convert *x1, atom:variant - 12:boolean/raw <- is-pair? x2 + s1:text, 11:bool/raw <- maybe-convert *x1, atom:variant + 12:bool/raw <- is-pair? x2 x3:&:cell <- first x2 - s2:text, 13:boolean/raw <- maybe-convert *x3, atom:variant + s2:text, 13:bool/raw <- maybe-convert *x3, atom:variant 14:&:cell/raw <- rest x2 20:@:char/raw <- copy *s1 30:@:char/raw <- copy *s2 @@ -436,17 +436,17 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color trace-should-contain [ app/parse: < abc | < def | < ghi | <> > > > ] - 10:boolean/raw <- is-pair? x + 10:bool/raw <- is-pair? x x1:&:cell <- first x x2:&:cell <- rest x - s1:text, 11:boolean/raw <- maybe-convert *x1, atom:variant - 12:boolean/raw <- is-pair? x2 + s1:text, 11:bool/raw <- maybe-convert *x1, atom:variant + 12:bool/raw <- is-pair? x2 x3:&:cell <- first x2 - s2:text, 13:boolean/raw <- maybe-convert *x3, atom:variant + s2:text, 13:bool/raw <- maybe-convert *x3, atom:variant x4:&:cell <- rest x2 - 14:boolean/raw <- is-pair? x4 + 14:bool/raw <- is-pair? x4 x5:&:cell <- first x4 - s3:text, 15:boolean/raw <- maybe-convert *x5, atom:variant + s3:text, 15:bool/raw <- maybe-convert *x5, atom:variant 16:&:cell/raw <- rest x4 20:@:char/raw <- copy *s1 30:@:char/raw <- copy *s2 @@ -472,11 +472,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color trace-should-contain [ app/parse: < < abc | <> > | <> > ] - 10:boolean/raw <- is-pair? x + 10:bool/raw <- is-pair? x x1:&:cell <- first x - 11:boolean/raw <- is-pair? x + 11:bool/raw <- is-pair? x x2:&:cell <- first x1 - s1:text, 12:boolean/raw <- maybe-convert *x2, atom:variant + s1:text, 12:bool/raw <- maybe-convert *x2, atom:variant 13:&:cell/raw <- rest x1 14:&:cell/raw <- rest x 20:@:char/raw <- copy *s1 @@ -497,15 +497,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color trace-should-contain [ app/parse: < < abc | <> > | < def | <> > > ] - 10:boolean/raw <- is-pair? x + 10:bool/raw <- is-pair? x x1:&:cell <- first x - 11:boolean/raw <- is-pair? x + 11:bool/raw <- is-pair? x x2:&:cell <- first x1 - s1:text, 12:boolean/raw <- maybe-convert *x2, atom:variant + s1:text, 12:bool/raw <- maybe-convert *x2, atom:variant 13:&:cell/raw <- rest x1 x3:&:cell <- rest x x4:&:cell <- first x3 - s2:text, 14:boolean/raw <- maybe-convert *x4, atom:variant + s2:text, 14:bool/raw <- maybe-convert *x4, atom:variant 15:&:cell/raw <- rest x3 20:@:char/raw <- copy *s1 30:@:char/raw <- copy *s2 @@ -552,11 +552,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color trace-should-contain [ app/parse: < abc | def > ] - 10:boolean/raw <- is-pair? x + 10:bool/raw <- is-pair? x x1:&:cell <- first x x2:&:cell <- rest x - s1:text, 11:boolean/raw <- maybe-convert *x1, atom:variant - s2:text, 12:boolean/raw <- maybe-convert *x2, atom:variant + s1:text, 11:bool/raw <- maybe-convert *x1, atom:variant + s2:text, 12:bool/raw <- maybe-convert *x2, atom:variant 20:@:char/raw <- copy *s1 30:@:char/raw <- copy *s2 memory-should-contain [ @@ -576,15 +576,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color trace-should-contain [ app/parse: < abc | < def | ghi > > ] - 10:boolean/raw <- is-pair? x + 10:bool/raw <- is-pair? x x1:&:cell <- first x x2:&:cell <- rest x - s1:text, 11:boolean/raw <- maybe-convert *x1, atom:variant - 12:boolean/raw <- is-pair? x2 + s1:text, 11:bool/raw <- maybe-convert *x1, atom:variant + 12:bool/raw <- is-pair? x2 x3:&:cell <- first x2 - s2:text, 13:boolean/raw <- maybe-convert *x3, atom:variant + s2:text, 13:bool/raw <- maybe-convert *x3, atom:variant x4:&:cell <- rest x2 - s3:text, 14:boolean/raw <- maybe-convert *x4, atom:variant + s3:text, 14:bool/raw <- maybe-convert *x4, atom:variant 20:@:char/raw <- copy *s1 30:@:char/raw <- copy *s2 40:@:char/raw <- copy *s3 -- cgit 1.4.1-2-gfad0