std: Fixed the stdlib

Author: hexaredecimal

std/args/args.pics

@@ -9,8 +9,8 @@ Args :: module {
   //
   // Example:
   // --- Code
-  //   let args = Args.get()
-  //   IO.println(Array.toString(args))
+  //   args := Args.get()
+  //   IO::println(Array::toString(args))
   // --- Code
   get :: () = _pic_nat_user_args
 

std/array/array.pics

@@ -88,9 +88,9 @@ Array :: module {
     when xs {
       is [] -> []
       is x:rest ->
-        if pred(x) {
+        if pred(x) do {
           x : filter(rest, pred)
-        } else {
+        } else do {
           filter(rest, pred)
         }
     }
@@ -154,9 +154,9 @@ Array :: module {
   // Returns:
   //   A new array with at most N elements
   take :: (xs=[], n=0) =
-    if n <= 0 {
+    if n <= 0 do {
       []
-    } else {
+    } else do {
       when xs {
         is [] -> []
         is x:rest -> x : take(rest, n - 1)
@@ -173,9 +173,9 @@ Array :: module {
   // Returns:
   //   A new array without the first N elements
   drop :: (xs=[], n=0) =
-    if n <= 0 {
+    if n <= 0 do {
       xs
-    } else {
+    } else do {
       when xs {
         is [] -> []
         is _:rest -> drop(rest, n - 1)
@@ -194,7 +194,7 @@ Array :: module {
   contains :: (xs=[], value) =
     when xs {
       is [] -> false
-      is x:rest -> if x == value { true } else { contains(rest, value) }
+      is x:rest -> if x == value do { true } else do { contains(rest, value) }
     }
 
   // Function: indexOf
@@ -210,7 +210,7 @@ Array :: module {
   indexOf :: (xs=[], value, i=0) =
     when xs {
       is [] -> -1
-      is x:rest -> if x == value { i } else { indexOf(rest, value, i + 1) }
+      is x:rest -> if x == value do { i } else do { indexOf(rest, value, i + 1) }
     }
 
   // Function: fromRange
@@ -223,12 +223,12 @@ Array :: module {
   // Returns:
   //   An array representing the range [start, ..., end]
   fromRange :: (start, end) = 
-    if start == end {
+    if start == end do {
       [end]
-    } else {
-      if start < end {
+    } else do {
+      if start < end do {
         start : fromRange(start + 1, end)
-      } else {
+      } else do {
         start : fromRange(start - 1, end)
       }
     }

std/math/math.pics

@@ -158,10 +158,10 @@ Math :: module {
   // Returns:
   //   The clamped value, either `a`, `low`, or `high`
   clamp :: (a=0, low=-1, high=1) = 
-     if a < low { low }
-     else { 
-       if a > high { high }
-       else { a }
+     if a < low do { low }
+     else do { 
+       if a > high do { high }
+       else do { a }
      }
 
 
@@ -174,7 +174,7 @@ Math :: module {
   //
   // Returns:
   //   The maximum between `a` and `b`
-  max :: (a=0, b=0) = if a > b { a } else { b }
+  max :: (a=0, b=0) = if a > b do { a } else do { b }
 
 
   // Function: min
@@ -186,7 +186,7 @@ Math :: module {
   //
   // Returns:
   //   The minimum between `a` and `b`
-  min :: (a=0, b=0) = if a < b { a } else { b }
+  min :: (a=0, b=0) = if a < b do { a } else do { b }
 
 
   // Function: degToRad
@@ -220,8 +220,8 @@ Math :: module {
   // Returns:
   //   The factorial of `n`
   factorial :: (n=0) =
-    if n <= 1 { 1 }
-    else { n * factorial(n - 1) } 
+    if n <= 1 do { 1 }
+    else do { n * factorial(n - 1) } 
 
   // Variable: E
   // The double value that is closer than any other to e, the base of the natural logarithms.

std/number/number.pics

@@ -91,9 +91,11 @@ Number :: module {
   //   -1 if the number is negative,
   //   0 if the number is zero
   sign :: (n=0) = 
-    if n > 0 then 1
-    else if n < 0 then -1
-    else 0
+    if n > 0 do { 1 }
+    else do { 
+			if n < 0 do { -1 }
+    	else do { 0 }
+		}
 
 }
 

std/string/string.pics

@@ -83,8 +83,8 @@ String :: module {
   // Returns:
   //   A new string consisting of `str` repeated `n` times
   repeat :: (str="", n=0) =
-    if n <= 0 { "" }
-    else { str + repeat(str, n - 1) }
+    if n <= 0 do { "" }
+    else do { str + repeat(str, n - 1) }
 
 
   // Function: padLeft
@@ -98,9 +98,9 @@ String :: module {
   // Returns:
   //   A new string padded on the left to reach `total` length
   padLeft :: (str="", total=0, char=" ") = do {
-    let padCount = total - String::length(str)
-    if padCount <= 0 { str }
-    else { repeat(char, padCount) + str }
+    padCount := total - String::length(str)
+    if padCount <= 0 do { str }
+    else do { repeat(char, padCount) + str }
   }
 
 
@@ -115,9 +115,9 @@ String :: module {
   // Returns:
   //   A new string padded on the right to reach `total` length
   padRight :: (str="", total=0, char=" ") = do {
-    let padCount = total - String::length(str)
-    if padCount <= 0 { str }
-    else { str + repeat(char, padCount) }
+    padCount := total - String::length(str)
+    if padCount <= 0 do { str }
+    else do { str + repeat(char, padCount) }
   }
 
   // Variable: EMPTY