Used new features

Split everything.fbl to 2 modules: core and tools
Changed the testing framework to use `puts`

Author: AgathokakologicalBit

language/core.fbl

@@ -0,0 +1,12 @@
+: ( set "void" [ --- ] void )
+: ( set "run" [ function ] function void )
+
+
+: ( set "__equals" equals )
+: ( set "equals" [ left ] [ right ] __if (__equals left right) true false )
+
+
+: ( set "true"  [ first ] [ second ] first )
+: ( set "false" [ first ] [ second ] second )
+: ( set "__if" if )
+: ( set "if" [ condition ] [ on_true ] [ on_false ] condition on_true on_false )

language/program.fbl

@@ -1,4 +1,5 @@
-: include "everything.fbl"
+: include "core.fbl"
+: include "tools.fbl"
 : include "testing.fbl"
 
 
@@ -25,13 +26,13 @@
 : (set "main" [ args ]
     : test "functions" ([ --- ]
         : describe "context_parent" ([ --- ]
-            : assert_equals    (42) (context_parent    42)  "should return the input"
-            : assert_equals ("foo") (context_parent "foo")  "should return the input"
-            : assert_equals  (test) (context_parent  test)  "should return the input"
+            : assert_equals    (42) (context_parent    42)  "return integer (42)"
+            : assert_equals ("foo") (context_parent "foo")  "return string  (foo)"
+            : assert_equals  (test) (context_parent  test)  "return function(test)"
             :
-            : assert_equals (void) (context_parent_global    42)  "should NOT return the input"
-            : assert_equals (void) (context_parent_global "foo")  "should NOT return the input"
-            : assert_equals (void) (context_parent_global  test)  "should NOT return the input"
+            : assert_equals (void) (context_parent_global    42)  "return void (ignore integer (42))"
+            : assert_equals (void) (context_parent_global "foo")  "return void (ignore string  (foo))"
+            : assert_equals (void) (context_parent_global  test)  "return void (ignore function(test))"
         )
         : describe "factorial" ([ --- ]
             : assert_equals      (1) (factorial 0) "0! == 1"
@@ -51,12 +52,11 @@
             : assert_equals  3 (% 17 7) "17 % 7 == 3"
         )
         : describe "convertion" ([ --- ]
-            : assert_equals 10 (int "10")      "should convert string to integer"
-            : assert_equals 10 (int "10.5")    "should convert string with trailing symbols to integer"
-            : assert_equals 10 (int 10.5)      "should convert decimal numbers to integers"
-            ` TODO: Add '.' as a separator
-            ` : assert_equals 10.5 (number "10.5") "should convert string to decimal number"
-            : assert_equals "1" (string 1)     "should convert numbers to string"
+            : assert_equals 10   (int "10")       "convert string to integer"
+            : assert_equals 10   (int "10.5")     "convert string with trailing symbols to integer"
+            : assert_equals 10   (int 10.5)       "convert decimal numbers to integers"
+            : assert_equals 10.5 (number "10.5")  "convert string to decimal number"
+            : assert_equals "1"  (string 1)       "convert numbers to string"
         )
     )
     : test "std" ([ --- ]

language/testing.fbl

@@ -1,4 +1,5 @@
-: include "everything.fbl"
+: include "core.fbl"
+: include "tools.fbl"
 
 
 ` Declaring counters in global scope
@@ -9,16 +10,16 @@
 
 ` Tests wrappers
 : ( set "test" [ title ] [ code ]
-    : print (+ (+ "\n===---   " title) "   ---===")
+    : puts "\n===---   " title "   ---===\n"
 
     : set "_$tests_total"  0
     : set "_$tests_passed" 0
     : run code
-    : print (+ (+ (+ "\nTests passed: " _$tests_passed) " / ") _$tests_total)
+    : puts "\nTests passed: " _$tests_passed " / " _$tests_total "\n"
 )
 
 : ( set "describe" [ title ] [ code ]
-    : print (+ "Testing #" title)
+    : puts "\nTesting #" title "\n"
     : run code
 )
 
@@ -27,6 +28,6 @@
 : ( set "assert_equals" [ expected ] [ actual ] [ message ] run (
     : set "_$tests_total" (+ _$tests_total 1)
     : if (not (equals expected actual))
-        ([ --- ] print (+ (+ (+ (+ (+ "FAILED...\n  Expected " expected) " but got ") actual) "\n  Message: ") message))
-        ([ --- ] print (+ "  passed - " message) : set "_$tests_passed" (+ _$tests_passed 1))
+        ([ --- ] puts "  FAILED...\n    Expected " expected " but got " actual "\n    Message: " message "\n")
+        ([ --- ] puts "  passed - " message "\n" : set "_$tests_passed" (+ _$tests_passed 1))
 ) )

language/everything.fbl language/tools.fbllanguage/everything.fbl renamed to language/tools.fbl

@@ -1,11 +1,7 @@
-: ( set "__equals" equals )
-: ( set "equals" [ left ] [ right ] __if (__equals left right) true false )
+: include "core.fbl"
 
-: ( set "true"  [ first ] [ second ] first )
-: ( set "false" [ first ] [ second ] second )
-: ( set "__if" if )
-: ( set "if" [ condition ] [ on_true ] [ on_false ] condition on_true on_false )
 
+` Convertion tools
 : ( set "bool" [ value ] __if value true false )
 : ( set "bti" [ value ] value 1 0 )
 
@@ -19,8 +15,6 @@
 
 
 ` Utility functions
-: ( set "void" [ --- ] void )
-: ( set "run" [ function ] function void )
 : ( set "id" [ value ] value )
 : ( set "power" [ _power ] [ function ] [ value ] run (
     __if _power