back out fancy/coffee function declarations

ingydotnet · Feb 26, 2013 · d2480d7 · d2480d7
1 parent 964cefd
commit d2480d7
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/function.tml b/function.tml
@@ -1,44 +1,50 @@
-%TestML 1.0
+%TestML 0.1.0
 # %DumpAst 1
 
 Plan = 21
 
 Label = 'Fruity Tests'
 
-->
+{
     Label = 'Anonymous function never called'
     True == False
+}
 
-test1 = (f, c, t) ->
+test1 = (f, c, t) {
     List(f, '->', c).Join == t
     t.Strip(f).Strip('->') == c
     t.Strip('->') == List(f, c).Join
+}
 
 test1.Type == 'Func'
 
 Label = '$BlockLabel'
 
 test1(*fruit, *color, *thing)
 
-test2 = ->
+test2 = {
     thing ~~ color
+}
 
 test2(*color, *thing)
 
-test3 = (a, b, c) ->
+test3 = (a, b, c) {
     f1(a) == b
     f2(a) == c
+}
 
 test3(*input, *output1, *output2)
 
 Label = 'Passing functions as objects'
 
-test4 = (func, num) ->
+test4 = (func, num) {
     func.Type == 'Func'
     func(num)
+}
 
-test5 = (num) ->
+test5 = (num) {
     num == 42
+}
 
 test4(test5, 42)
 

diff --git a/semicolons.tml b/semicolons.tml
@@ -3,7 +3,7 @@
 
 %TestML 0.1.0
 
-Plan = 2;
+Plan = 3;
 
 'one' == 'one'
 'two' == 'two';

diff --git a/standard.tml b/standard.tml
@@ -1,12 +1,12 @@
 %TestML 0.1.0
 
 Title = 'Test the TestML Standard Library'
-Plan = 10
+Plan = 12
 
 True.OK
 False.Not.OK
 None.Not.OK
-*lines.Lines.Count == 5
+*lines.Lines.Count == 12
 *foo.Lines.Join(' - ')  == *bar
 *foo.Lines.Reverse.Text == *baz
 *foo.Lines.Sort.Text    == *baz.Lines.Sort.Text
@@ -18,7 +18,7 @@ sail
 
 away
 
-### Standard Transforms
+### Standard Calls
 List
 NOT
 

diff --git a/types.tml b/types.tml
@@ -20,5 +20,5 @@ b = False
 b.Type == 'Bool'
 l = List()
 l.Type == 'List'
-f = ->
+f = {}
 f.Type == 'Func'