casify tutorial examples
will bring document in line in a later CL, which may include revisiting some of the names
R=rsc
DELTA=58 (0 added, 0 deleted, 58 changed)
OCL=22906
CL=22908
diff --git a/doc/progs/sieve1.go b/doc/progs/sieve1.go
index 3f2cb9e..c9b27f0 100644
--- a/doc/progs/sieve1.go
+++ b/doc/progs/sieve1.go
@@ -5,7 +5,7 @@
package main
// Send the sequence 2, 3, 4, ... to returned channel
-func Generate() chan int {
+func generate() chan int {
ch := make(chan int);
go func(ch chan int){
for i := 2; ; i++ {
@@ -16,7 +16,7 @@
}
// Filter out input values divisible by 'prime', send rest to returned channel
-func Filter(in chan int, prime int) chan int {
+func filter(in chan int, prime int) chan int {
out := make(chan int);
go func(in chan int, out chan int, prime int) {
for {
@@ -28,21 +28,21 @@
return out;
}
-func Sieve() chan int {
+func sieve() chan int {
out := make(chan int);
go func(out chan int) {
- ch := Generate();
+ ch := generate();
for {
prime := <-ch;
out <- prime;
- ch = Filter(ch, prime);
+ ch = filter(ch, prime);
}
}(out);
return out;
}
func main() {
- primes := Sieve();
+ primes := sieve();
for {
print(<-primes, "\n");
}
