From a733b245a4e517d95ae7f05f3aaee7c2a83394c0 Mon Sep 17 00:00:00 2001 From: Christopher Bertels Date: Tue, 14 Dec 2010 11:14:24 +0100 Subject: [PATCH] Small readability improvements to example files. --- examples/armstrong_numbers.fy | 2 +- examples/blocks.fy | 2 +- examples/echo.fy | 2 +- examples/fibonacci.fy | 12 ++++-------- examples/project-euler/02.fy | 2 +- examples/project-euler/28.fy | 2 +- examples/rbx/blocks.fy | 2 +- examples/regex.fy | 2 +- 8 files changed, 11 insertions(+), 15 deletions(-) diff --git a/examples/armstrong_numbers.fy b/examples/armstrong_numbers.fy index 7bfd94ea..16e39e63 100644 --- a/examples/armstrong_numbers.fy +++ b/examples/armstrong_numbers.fy @@ -10,7 +10,7 @@ class Fixnum { decimals = [] tmp = self - { tmp >= 10 } while_true: { + while: { tmp >= 10 } do: { decimals << (tmp modulo: 10) tmp = (tmp div: 10) } diff --git a/examples/blocks.fy b/examples/blocks.fy index b7a03861..6930b3fd 100644 --- a/examples/blocks.fy +++ b/examples/blocks.fy @@ -9,7 +9,7 @@ y call: [2, 3] # calls y and prints: 5 # prints numbers 0 to 20 zahl = 0 -{ zahl <= 20 } while_true: { +while: { zahl <= 20 } do: { Console println: zahl zahl = zahl + 1 } diff --git a/examples/echo.fy b/examples/echo.fy index 3fa2458a..0b656230 100644 --- a/examples/echo.fy +++ b/examples/echo.fy @@ -4,7 +4,7 @@ ARGV[1] if_do: |filename| { try { File open: filename modes: ['read] with: |f| { - { f eof? } while_false: { + until: { f eof? } do: { f readln println } } diff --git a/examples/fibonacci.fy b/examples/fibonacci.fy index 3f66444a..787a2ab9 100644 --- a/examples/fibonacci.fy +++ b/examples/fibonacci.fy @@ -3,14 +3,10 @@ class Fixnum { def fib { - if: (self == 0) then: { - 0 - } else: { - if: (self == 1) then: { - 1 - } else: { - self - 1 fib + (self - 2 fib) - } + match self -> { + case 0 -> 0 + case 1 -> 1 + case _ -> self - 1 fib + (self - 2 fib) } } } diff --git a/examples/project-euler/02.fy b/examples/project-euler/02.fy index c7bd2560..eaea78a2 100644 --- a/examples/project-euler/02.fy +++ b/examples/project-euler/02.fy @@ -10,7 +10,7 @@ fibs = [1, 2] # insert into fibs as long as the sum of the last two numbers doesn't # exceed 4000000 -{ fibs[-1] + (fibs[-2]) <= 4000000 } while_true: { +while: { fibs[-1] + (fibs[-2]) <= 4000000 } do: { fibs << (fibs last: 2 . sum) } diff --git a/examples/project-euler/28.fy b/examples/project-euler/28.fy index b1c82e1c..a1b22ab0 100644 --- a/examples/project-euler/28.fy +++ b/examples/project-euler/28.fy @@ -19,7 +19,7 @@ number = taille ** 2 coins = 1 sum = number -{ pas > 0 } while_true: { +while: { pas > 0 } do: { number = number - pas sum = sum + number if: (coins == 4) then: { diff --git a/examples/rbx/blocks.fy b/examples/rbx/blocks.fy index c7fd3699..16fbdfc0 100644 --- a/examples/rbx/blocks.fy +++ b/examples/rbx/blocks.fy @@ -7,7 +7,7 @@ } x = 0 -{ x < 4 } while_true: { +while: { x < 4 } do: { "in while_true, with x = " ++ x println x = x + 1 } diff --git a/examples/regex.fy b/examples/regex.fy index 8757c2c5..57c0310d 100644 --- a/examples/regex.fy +++ b/examples/regex.fy @@ -1,7 +1,7 @@ regex = /[a-z]+[A-Z]*foo/ str = "heLLofoo" -str =~(regex) if_do: |idx| { +if: (str =~ regex) then: |idx| { "match at index: " ++ idx ++ " with character: " print str[idx] inspect println }