Merge remote-tracking branch 'remotes/github/build-010388-scheme' into build-010388-schemebuild-010388-scheme

1 files changed, 115 insertions, 93 deletions

diff --git a/test.out b/test.out
index 31bac64..2576315 100644
--- a/test.out
+++ b/test.out
@@ -1,94 +1,116 @@
-#*
- * Examples of how to use arrays
- *#
+(def (test a)
+   (def (test2 a2) 
+      (def (test3 a3)
+         (BEEP))
+      (test3 a2))
+   (def foo bar)
+   (def (barrr) foo)
+   (def (barr) (foo baz))
+   (def (bar x) (foo baz))
+   (test2 a))
+(test (foo bar baz))
+(say "hello world" 1.2)
 
-# Create a function bar, returns 0 by default
-func bar { say "bar" } 
-
-# Create a multi dimensional array foo
-my foo = [bar, 1, 4/2, double "3", ["A", ["BA", "BB"]]];
-
-# Run on each element of foo recursive 'say'
-say foo;
-
-# Print the length of the array
-assert 5 == say len foo;
-
-# Print the last index of the array
-assert 4 == say ind foo;
-
-# Print the 3rd element of the array
-say foo[3];
-
-#say "bla";
-Token (id=00000, line=00006, pos=0005, type=TT_FUNC, val=func, ival=0, dval=0.000000, refs=1)
-Token (id=00001, line=00006, pos=0009, type=TT_IDENT, val=bar, ival=0, dval=0.000000, refs=1)
-Token (id=00002, line=00006, pos=0011, type=TT_PARANT_CL, val={, ival=0, dval=0.000000, refs=1)
-Token (id=00003, line=00006, pos=0015, type=TT_IDENT, val=say, ival=0, dval=0.000000, refs=1)
-Token (id=00004, line=00006, pos=0016, type=TT_STRING, val=bar, ival=0, dval=0.000000, refs=1)
-Token (id=00005, line=00006, pos=0019, type=TT_PARANT_CR, val=}, ival=0, dval=0.000000, refs=1)
-Token (id=00006, line=00009, pos=0003, type=TT_MY, val=my, ival=0, dval=0.000000, refs=1)
-Token (id=00007, line=00009, pos=0007, type=TT_IDENT, val=foo, ival=0, dval=0.000000, refs=1)
-Token (id=00008, line=00009, pos=0009, type=TT_ASSIGN, val==, ival=0, dval=0.000000, refs=1)
-Token (id=00009, line=00009, pos=0011, type=TT_PARANT_AL, val=[, ival=0, dval=0.000000, refs=1)
-Token (id=00010, line=00009, pos=0014, type=TT_IDENT, val=bar, ival=0, dval=0.000000, refs=1)
-Token (id=00011, line=00009, pos=0015, type=TT_COMMA, val=,, ival=0, dval=0.000000, refs=1)
-Token (id=00012, line=00009, pos=0017, type=TT_INTEGER, val=1, ival=1, dval=0.000000, refs=1)
-Token (id=00013, line=00009, pos=0018, type=TT_COMMA, val=,, ival=0, dval=0.000000, refs=1)
-Token (id=00014, line=00009, pos=0020, type=TT_INTEGER, val=4, ival=4, dval=0.000000, refs=1)
-Token (id=00015, line=00009, pos=0021, type=TT_DIV, val=/, ival=0, dval=0.000000, refs=1)
-Token (id=00016, line=00009, pos=0022, type=TT_INTEGER, val=2, ival=2, dval=0.000000, refs=1)
-Token (id=00017, line=00009, pos=0023, type=TT_COMMA, val=,, ival=0, dval=0.000000, refs=1)
-Token (id=00018, line=00009, pos=0030, type=TT_IDENT, val=double, ival=0, dval=0.000000, refs=1)
-Token (id=00019, line=00009, pos=0031, type=TT_STRING, val=3, ival=0, dval=0.000000, refs=1)
-Token (id=00020, line=00009, pos=0033, type=TT_COMMA, val=,, ival=0, dval=0.000000, refs=1)
-Token (id=00021, line=00009, pos=0035, type=TT_PARANT_AL, val=[, ival=0, dval=0.000000, refs=1)
-Token (id=00022, line=00009, pos=0035, type=TT_STRING, val=A, ival=0, dval=0.000000, refs=1)
-Token (id=00023, line=00009, pos=0037, type=TT_COMMA, val=,, ival=0, dval=0.000000, refs=1)
-Token (id=00024, line=00009, pos=0039, type=TT_PARANT_AL, val=[, ival=0, dval=0.000000, refs=1)
-Token (id=00025, line=00009, pos=0039, type=TT_STRING, val=BA, ival=0, dval=0.000000, refs=1)
-Token (id=00026, line=00009, pos=0041, type=TT_COMMA, val=,, ival=0, dval=0.000000, refs=1)
-Token (id=00027, line=00009, pos=0042, type=TT_STRING, val=BB, ival=0, dval=0.000000, refs=1)
-Token (id=00028, line=00009, pos=0044, type=TT_PARANT_AR, val=], ival=0, dval=0.000000, refs=1)
-Token (id=00029, line=00009, pos=0044, type=TT_SEMICOLON, val=;, ival=0, dval=0.000000, refs=1)
-Token (id=00030, line=00009, pos=0045, type=TT_PARANT_AR, val=], ival=0, dval=0.000000, refs=1)
-Token (id=00031, line=00009, pos=0045, type=TT_SEMICOLON, val=;, ival=0, dval=0.000000, refs=1)
-Token (id=00032, line=00009, pos=0046, type=TT_PARANT_AR, val=], ival=0, dval=0.000000, refs=1)
-Token (id=00033, line=00009, pos=0047, type=TT_SEMICOLON, val=;, ival=0, dval=0.000000, refs=1)
-Token (id=00034, line=00012, pos=0004, type=TT_IDENT, val=say, ival=0, dval=0.000000, refs=1)
-Token (id=00035, line=00012, pos=0008, type=TT_IDENT, val=foo, ival=0, dval=0.000000, refs=1)
-Token (id=00036, line=00012, pos=0009, type=TT_SEMICOLON, val=;, ival=0, dval=0.000000, refs=1)
-Token (id=00037, line=00015, pos=0007, type=TT_IDENT, val=assert, ival=0, dval=0.000000, refs=1)
-Token (id=00038, line=00015, pos=0009, type=TT_INTEGER, val=5, ival=5, dval=0.000000, refs=1)
-Token (id=00039, line=00015, pos=0011, type=TT_ASSIGN, val==, ival=0, dval=0.000000, refs=1)
-Token (id=00040, line=00015, pos=0012, type=TT_ASSIGN, val==, ival=0, dval=0.000000, refs=1)
-Token (id=00041, line=00015, pos=0016, type=TT_IDENT, val=say, ival=0, dval=0.000000, refs=1)
-Token (id=00042, line=00015, pos=0020, type=TT_IDENT, val=len, ival=0, dval=0.000000, refs=1)
-Token (id=00043, line=00015, pos=0024, type=TT_IDENT, val=foo, ival=0, dval=0.000000, refs=1)
-Token (id=00044, line=00015, pos=0025, type=TT_SEMICOLON, val=;, ival=0, dval=0.000000, refs=1)
-Token (id=00045, line=00018, pos=0007, type=TT_IDENT, val=assert, ival=0, dval=0.000000, refs=1)
-Token (id=00046, line=00018, pos=0009, type=TT_INTEGER, val=4, ival=4, dval=0.000000, refs=1)
-Token (id=00047, line=00018, pos=0011, type=TT_ASSIGN, val==, ival=0, dval=0.000000, refs=1)
-Token (id=00048, line=00018, pos=0012, type=TT_ASSIGN, val==, ival=0, dval=0.000000, refs=1)
-Token (id=00049, line=00018, pos=0016, type=TT_IDENT, val=say, ival=0, dval=0.000000, refs=1)
-Token (id=00050, line=00018, pos=0020, type=TT_IDENT, val=ind, ival=0, dval=0.000000, refs=1)
-Token (id=00051, line=00018, pos=0024, type=TT_IDENT, val=foo, ival=0, dval=0.000000, refs=1)
-Token (id=00052, line=00018, pos=0025, type=TT_SEMICOLON, val=;, ival=0, dval=0.000000, refs=1)
-Token (id=00053, line=00021, pos=0004, type=TT_IDENT, val=say, ival=0, dval=0.000000, refs=1)
-Token (id=00054, line=00021, pos=0008, type=TT_IDENT, val=foo, ival=0, dval=0.000000, refs=1)
-Token (id=00055, line=00021, pos=0009, type=TT_PARANT_AL, val=[, ival=0, dval=0.000000, refs=1)
-Token (id=00056, line=00021, pos=0010, type=TT_INTEGER, val=3, ival=3, dval=0.000000, refs=1)
-Token (id=00057, line=00021, pos=0010, type=TT_SEMICOLON, val=;, ival=0, dval=0.000000, refs=1)
-Token (id=00058, line=00021, pos=0011, type=TT_PARANT_AR, val=], ival=0, dval=0.000000, refs=1)
-Token (id=00059, line=00021, pos=0012, type=TT_SEMICOLON, val=;, ival=0, dval=0.000000, refs=1)
-bar
-0
-1
-2
-3.000000
-A
-BA
-BB
-5
-4
-3.000000
+Token (id=00000, line=00001, pos=0001, type=TT_PARANT_L, val=()
+Token (id=00001, line=00001, pos=0005, type=TT_IDENT, val=def)
+Token (id=00002, line=00001, pos=0006, type=TT_PARANT_L, val=()
+Token (id=00003, line=00001, pos=0011, type=TT_IDENT, val=test)
+Token (id=00004, line=00001, pos=0013, type=TT_IDENT, val=a)
+Token (id=00005, line=00001, pos=0014, type=TT_PARANT_R, val=))
+Token (id=00006, line=00002, pos=0004, type=TT_PARANT_L, val=()
+Token (id=00007, line=00002, pos=0008, type=TT_IDENT, val=def)
+Token (id=00008, line=00002, pos=0009, type=TT_PARANT_L, val=()
+Token (id=00009, line=00002, pos=0015, type=TT_IDENT, val=test2)
+Token (id=00010, line=00002, pos=0018, type=TT_IDENT, val=a2)
+Token (id=00011, line=00002, pos=0019, type=TT_PARANT_R, val=))
+Token (id=00012, line=00003, pos=0007, type=TT_PARANT_L, val=()
+Token (id=00013, line=00003, pos=0011, type=TT_IDENT, val=def)
+Token (id=00014, line=00003, pos=0012, type=TT_PARANT_L, val=()
+Token (id=00015, line=00003, pos=0018, type=TT_IDENT, val=test3)
+Token (id=00016, line=00003, pos=0021, type=TT_IDENT, val=a3)
+Token (id=00017, line=00003, pos=0022, type=TT_PARANT_R, val=))
+Token (id=00018, line=00004, pos=0010, type=TT_PARANT_L, val=()
+Token (id=00019, line=00004, pos=0015, type=TT_IDENT, val=BEEP)
+Token (id=00020, line=00004, pos=0016, type=TT_PARANT_R, val=))
+Token (id=00021, line=00004, pos=0017, type=TT_PARANT_R, val=))
+Token (id=00022, line=00005, pos=0007, type=TT_PARANT_L, val=()
+Token (id=00023, line=00005, pos=0013, type=TT_IDENT, val=test3)
+Token (id=00024, line=00005, pos=0016, type=TT_IDENT, val=a2)
+Token (id=00025, line=00005, pos=0017, type=TT_PARANT_R, val=))
+Token (id=00026, line=00005, pos=0018, type=TT_PARANT_R, val=))
+Token (id=00027, line=00006, pos=0004, type=TT_PARANT_L, val=()
+Token (id=00028, line=00006, pos=0008, type=TT_IDENT, val=def)
+Token (id=00029, line=00006, pos=0012, type=TT_IDENT, val=foo)
+Token (id=00030, line=00006, pos=0016, type=TT_IDENT, val=bar)
+Token (id=00031, line=00006, pos=0017, type=TT_PARANT_R, val=))
+Token (id=00032, line=00007, pos=0004, type=TT_PARANT_L, val=()
+Token (id=00033, line=00007, pos=0008, type=TT_IDENT, val=def)
+Token (id=00034, line=00007, pos=0009, type=TT_PARANT_L, val=()
+Token (id=00035, line=00007, pos=0015, type=TT_IDENT, val=barrr)
+Token (id=00036, line=00007, pos=0016, type=TT_PARANT_R, val=))
+Token (id=00037, line=00007, pos=0020, type=TT_IDENT, val=foo)
+Token (id=00038, line=00007, pos=0021, type=TT_PARANT_R, val=))
+Token (id=00039, line=00008, pos=0004, type=TT_PARANT_L, val=()
+Token (id=00040, line=00008, pos=0008, type=TT_IDENT, val=def)
+Token (id=00041, line=00008, pos=0009, type=TT_PARANT_L, val=()
+Token (id=00042, line=00008, pos=0014, type=TT_IDENT, val=barr)
+Token (id=00043, line=00008, pos=0015, type=TT_PARANT_R, val=))
+Token (id=00044, line=00008, pos=0016, type=TT_PARANT_L, val=()
+Token (id=00045, line=00008, pos=0020, type=TT_IDENT, val=foo)
+Token (id=00046, line=00008, pos=0024, type=TT_IDENT, val=baz)
+Token (id=00047, line=00008, pos=0025, type=TT_PARANT_R, val=))
+Token (id=00048, line=00008, pos=0026, type=TT_PARANT_R, val=))
+Token (id=00049, line=00009, pos=0004, type=TT_PARANT_L, val=()
+Token (id=00050, line=00009, pos=0008, type=TT_IDENT, val=def)
+Token (id=00051, line=00009, pos=0009, type=TT_PARANT_L, val=()
+Token (id=00052, line=00009, pos=0013, type=TT_IDENT, val=bar)
+Token (id=00053, line=00009, pos=0015, type=TT_IDENT, val=x)
+Token (id=00054, line=00009, pos=0016, type=TT_PARANT_R, val=))
+Token (id=00055, line=00009, pos=0017, type=TT_PARANT_L, val=()
+Token (id=00056, line=00009, pos=0021, type=TT_IDENT, val=foo)
+Token (id=00057, line=00009, pos=0025, type=TT_IDENT, val=baz)
+Token (id=00058, line=00009, pos=0026, type=TT_PARANT_R, val=))
+Token (id=00059, line=00009, pos=0027, type=TT_PARANT_R, val=))
+Token (id=00060, line=00010, pos=0004, type=TT_PARANT_L, val=()
+Token (id=00061, line=00010, pos=0010, type=TT_IDENT, val=test2)
+Token (id=00062, line=00010, pos=0012, type=TT_IDENT, val=a)
+Token (id=00063, line=00010, pos=0013, type=TT_PARANT_R, val=))
+Token (id=00064, line=00010, pos=0014, type=TT_PARANT_R, val=))
+Token (id=00065, line=00011, pos=0001, type=TT_PARANT_L, val=()
+Token (id=00066, line=00011, pos=0006, type=TT_IDENT, val=test)
+Token (id=00067, line=00011, pos=0007, type=TT_PARANT_L, val=()
+Token (id=00068, line=00011, pos=0011, type=TT_IDENT, val=foo)
+Token (id=00069, line=00011, pos=0015, type=TT_IDENT, val=bar)
+Token (id=00070, line=00011, pos=0019, type=TT_IDENT, val=baz)
+Token (id=00071, line=00011, pos=0020, type=TT_PARANT_R, val=))
+Token (id=00072, line=00011, pos=0021, type=TT_PARANT_R, val=))
+Token (id=00073, line=00012, pos=0001, type=TT_PARANT_L, val=()
+Token (id=00074, line=00012, pos=0005, type=TT_IDENT, val=say)
+Token (id=00075, line=00012, pos=0006, type=TT_STRING, val=hello world)
+Token (id=00076, line=00012, pos=0009, type=TT_INTEGER, val=1)
+Token (id=00077, line=00012, pos=0009, type=TT_DOT, val=.)
+Token (id=00078, line=00012, pos=0011, type=TT_INTEGER, val=2)
+Token (id=00079, line=00012, pos=0012, type=TT_PARANT_R, val=))
+No symbol 'BEEP' defined @ any frame:
+FRAME(id=3) 0:
++ST_VARIABLE(name=a3,value=a2)
+FRAME(id=2) 1:
++ST_VARIABLE(name=a2,value=a)
++ST_LAMBDA(name=test3;args=a3)
+( ( BEEP ) ) 
+FRAME(id=1) 2:
++ST_LAMBDA(name=a;args=)
+( ( foo bar baz ) 
++ST_LAMBDA(name=test2;args=a2)
+( ( def ( test3 a3 ) ( BEEP ) ) ( test3 a2 ) ) 
++ST_LAMBDA(name=barrr;args=)
+( foo ) 
++ST_LAMBDA(name=barr;args=)
+( ( foo baz ) ) 
++ST_LAMBDA(name=bar;args=x)
+( ( foo baz ) ) 
++ST_VARIABLE(name=foo,value=bar)
+FRAME(id=0) 3:
++ST_LAMBDA(name=test;args=a)
+( ( def ( test2 a2 ) ( def ( test3 a3 ) ( BEEP ) ) ( test3 a2 ) ) ( def foo bar ) ( def ( barrr ) foo ) ( def ( barr ) ( foo baz ) ) ( def ( bar x ) ( foo baz ) ) ( test2 a ) ) 
+Error.: Interpret error in ./test.fype line 4 pos 15 near 'BEEP' (Fype2 @ ./src/core/interpret.c line 342)