diff --git a/.gitignore b/.gitignore index 75376699..2b2e4aa8 100644 --- a/.gitignore +++ b/.gitignore @@ -3,12 +3,12 @@ *.dot cmd/goexports/goexports gi -gi_c/*.o -gi_c/gi -gi_c/loop2 -gi_c/l2 -gi_c/deps/lightning-* -gi_c/deps/lib -gi_c/deps/include -gi_c/deps/share -gi_c/deps/*.gz +_gi_c/*.o +_gi_c/gi +_gi_c/loop2 +_gi_c/l2 +_gi_c/deps/lightning-* +_gi_c/deps/lib +_gi_c/deps/include +_gi_c/deps/share +_gi_c/deps/*.gz diff --git a/README.md b/README.md index 7bc71842..dc8200d1 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ A Go interpreter in go Tests are simple standalone go programs to be run by `gi` executable. Scripts are converted to go test examples for execution by `go test` as well. -To create a new test, simply add a new .gi file, specifying expected output at end of program in a `// Output:' comment block like in the following example: +To create a new test, simply add a new .gi file, specifying expected output at end of program in a `// Output:` comment block like in the following example: ```go package main @@ -18,7 +18,7 @@ func main() { // Hello ``` -Then in `test/`, run `make` to re-generate `interp/eval_test.go` +Then in `_test/`, run `make` to re-generate `interp/eval_test.go` When developping/debugging, I'm running `gi` on a single script, using `-a` and `-c` options to display AST and CFG graphs, and instrumenting code with temporary println statements to diagnose problems. diff --git a/gi_c/Makefile b/_gi_c/Makefile similarity index 100% rename from gi_c/Makefile rename to _gi_c/Makefile diff --git a/gi_c/README.md b/_gi_c/README.md similarity index 100% rename from gi_c/README.md rename to _gi_c/README.md diff --git a/gi_c/deps/Makefile b/_gi_c/deps/Makefile similarity index 100% rename from gi_c/deps/Makefile rename to _gi_c/deps/Makefile diff --git a/gi_c/deps/deps.mk b/_gi_c/deps/deps.mk similarity index 100% rename from gi_c/deps/deps.mk rename to _gi_c/deps/deps.mk diff --git a/gi_c/deps/lightning.makefile b/_gi_c/deps/lightning.makefile similarity index 100% rename from gi_c/deps/lightning.makefile rename to _gi_c/deps/lightning.makefile diff --git a/gi_c/gi.c b/_gi_c/gi.c similarity index 100% rename from gi_c/gi.c rename to _gi_c/gi.c diff --git a/gi_c/graph.c b/_gi_c/graph.c similarity index 100% rename from gi_c/graph.c rename to _gi_c/graph.c diff --git a/gi_c/graph.h b/_gi_c/graph.h similarity index 100% rename from gi_c/graph.h rename to _gi_c/graph.h diff --git a/gi_c/hash.c b/_gi_c/hash.c similarity index 100% rename from gi_c/hash.c rename to _gi_c/hash.c diff --git a/gi_c/hash.h b/_gi_c/hash.h similarity index 100% rename from gi_c/hash.h rename to _gi_c/hash.h diff --git a/gi_c/init_go.c b/_gi_c/init_go.c similarity index 100% rename from gi_c/init_go.c rename to _gi_c/init_go.c diff --git a/gi_c/init_go.h b/_gi_c/init_go.h similarity index 100% rename from gi_c/init_go.h rename to _gi_c/init_go.h diff --git a/gi_c/l2.go b/_gi_c/l2.go similarity index 100% rename from gi_c/l2.go rename to _gi_c/l2.go diff --git a/gi_c/l3.go b/_gi_c/l3.go similarity index 100% rename from gi_c/l3.go rename to _gi_c/l3.go diff --git a/gi_c/loop2.go b/_gi_c/loop2.go similarity index 100% rename from gi_c/loop2.go rename to _gi_c/loop2.go diff --git a/gi_c/node.c b/_gi_c/node.c similarity index 100% rename from gi_c/node.c rename to _gi_c/node.c diff --git a/gi_c/node.h b/_gi_c/node.h similarity index 100% rename from gi_c/node.h rename to _gi_c/node.h diff --git a/gi_c/parse_go.c b/_gi_c/parse_go.c similarity index 100% rename from gi_c/parse_go.c rename to _gi_c/parse_go.c diff --git a/gi_c/parse_go.h b/_gi_c/parse_go.h similarity index 100% rename from gi_c/parse_go.h rename to _gi_c/parse_go.h diff --git a/gi_c/run_cfg.c b/_gi_c/run_cfg.c similarity index 100% rename from gi_c/run_cfg.c rename to _gi_c/run_cfg.c diff --git a/gi_c/run_cfg.h b/_gi_c/run_cfg.h similarity index 100% rename from gi_c/run_cfg.h rename to _gi_c/run_cfg.h diff --git a/gi_c/run_jit.c b/_gi_c/run_jit.c similarity index 100% rename from gi_c/run_jit.c rename to _gi_c/run_jit.c diff --git a/gi_c/run_jit.h b/_gi_c/run_jit.h similarity index 100% rename from gi_c/run_jit.h rename to _gi_c/run_jit.h diff --git a/gi_c/scan.c b/_gi_c/scan.c similarity index 100% rename from gi_c/scan.c rename to _gi_c/scan.c diff --git a/gi_c/scan.h b/_gi_c/scan.h similarity index 100% rename from gi_c/scan.h rename to _gi_c/scan.h diff --git a/gi_c/trace.h b/_gi_c/trace.h similarity index 100% rename from gi_c/trace.h rename to _gi_c/trace.h diff --git a/test/Makefile b/_test/Makefile similarity index 100% rename from test/Makefile rename to _test/Makefile diff --git a/test/a1.go b/_test/a1.go similarity index 100% rename from test/a1.go rename to _test/a1.go diff --git a/test/a10.go b/_test/a10.go similarity index 100% rename from test/a10.go rename to _test/a10.go diff --git a/test/a11.go b/_test/a11.go similarity index 100% rename from test/a11.go rename to _test/a11.go diff --git a/test/a2.go b/_test/a2.go similarity index 100% rename from test/a2.go rename to _test/a2.go diff --git a/test/a3.go b/_test/a3.go similarity index 100% rename from test/a3.go rename to _test/a3.go diff --git a/test/a4.go b/_test/a4.go similarity index 100% rename from test/a4.go rename to _test/a4.go diff --git a/test/a5.go b/_test/a5.go similarity index 100% rename from test/a5.go rename to _test/a5.go diff --git a/test/a6.go b/_test/a6.go similarity index 100% rename from test/a6.go rename to _test/a6.go diff --git a/test/a7.go b/_test/a7.go similarity index 100% rename from test/a7.go rename to _test/a7.go diff --git a/test/a8.go b/_test/a8.go similarity index 100% rename from test/a8.go rename to _test/a8.go diff --git a/test/a9.go b/_test/a9.go similarity index 100% rename from test/a9.go rename to _test/a9.go diff --git a/test/and.go b/_test/and.go similarity index 100% rename from test/and.go rename to _test/and.go diff --git a/test/assign.go b/_test/assign.go similarity index 100% rename from test/assign.go rename to _test/assign.go diff --git a/test/bool.go b/_test/bool.go similarity index 100% rename from test/bool.go rename to _test/bool.go diff --git a/test/chan0.go b/_test/chan0.go similarity index 100% rename from test/chan0.go rename to _test/chan0.go diff --git a/test/chan1.go b/_test/chan1.go similarity index 100% rename from test/chan1.go rename to _test/chan1.go diff --git a/test/chan2.go b/_test/chan2.go similarity index 100% rename from test/chan2.go rename to _test/chan2.go diff --git a/test/const0.go b/_test/const0.go similarity index 100% rename from test/const0.go rename to _test/const0.go diff --git a/test/cont.go b/_test/cont.go similarity index 100% rename from test/cont.go rename to _test/cont.go diff --git a/test/cont0.go b/_test/cont0.go similarity index 100% rename from test/cont0.go rename to _test/cont0.go diff --git a/test/cont1.go b/_test/cont1.go similarity index 100% rename from test/cont1.go rename to _test/cont1.go diff --git a/test/export0.go b/_test/export0.go similarity index 100% rename from test/export0.go rename to _test/export0.go diff --git a/test/export1.go b/_test/export1.go similarity index 100% rename from test/export1.go rename to _test/export1.go diff --git a/test/fib.go b/_test/fib.go similarity index 100% rename from test/fib.go rename to _test/fib.go diff --git a/test/fib0.go b/_test/fib0.go similarity index 100% rename from test/fib0.go rename to _test/fib0.go diff --git a/test/for0.go b/_test/for0.go similarity index 100% rename from test/for0.go rename to _test/for0.go diff --git a/test/for1.go b/_test/for1.go similarity index 100% rename from test/for1.go rename to _test/for1.go diff --git a/test/for2.go b/_test/for2.go similarity index 100% rename from test/for2.go rename to _test/for2.go diff --git a/test/fun.go b/_test/fun.go similarity index 100% rename from test/fun.go rename to _test/fun.go diff --git a/test/fun2.go b/_test/fun2.go similarity index 100% rename from test/fun2.go rename to _test/fun2.go diff --git a/test/fun3.go b/_test/fun3.go similarity index 100% rename from test/fun3.go rename to _test/fun3.go diff --git a/test/gen_example.sh b/_test/gen_example.sh similarity index 87% rename from test/gen_example.sh rename to _test/gen_example.sh index 6792a0f9..a431ef27 100755 --- a/test/gen_example.sh +++ b/_test/gen_example.sh @@ -2,7 +2,7 @@ echo 'package interp' echo -echo '// Do not edit! File generated by ../test/gen_example.sh' +echo '// Do not edit! File generated by ../_test/gen_example.sh' echo echo 'import "github.com/containous/gi/export"' echo diff --git a/test/goroutine.go b/_test/goroutine.go similarity index 100% rename from test/goroutine.go rename to _test/goroutine.go diff --git a/test/heap.go b/_test/heap.go similarity index 100% rename from test/heap.go rename to _test/heap.go diff --git a/test/if.go b/_test/if.go similarity index 100% rename from test/if.go rename to _test/if.go diff --git a/test/import0.go b/_test/import0.go similarity index 100% rename from test/import0.go rename to _test/import0.go diff --git a/test/import1.go b/_test/import1.go similarity index 100% rename from test/import1.go rename to _test/import1.go diff --git a/test/import2.go b/_test/import2.go similarity index 100% rename from test/import2.go rename to _test/import2.go diff --git a/test/init0.go b/_test/init0.go similarity index 100% rename from test/init0.go rename to _test/init0.go diff --git a/test/interface0.go b/_test/interface0.go similarity index 100% rename from test/interface0.go rename to _test/interface0.go diff --git a/test/iota.go b/_test/iota.go similarity index 100% rename from test/iota.go rename to _test/iota.go diff --git a/test/l2.go b/_test/l2.go similarity index 100% rename from test/l2.go rename to _test/l2.go diff --git a/test/l3.go b/_test/l3.go similarity index 100% rename from test/l3.go rename to _test/l3.go diff --git a/test/l4.go b/_test/l4.go similarity index 100% rename from test/l4.go rename to _test/l4.go diff --git a/test/map.go b/_test/map.go similarity index 100% rename from test/map.go rename to _test/map.go diff --git a/test/map2.go b/_test/map2.go similarity index 100% rename from test/map2.go rename to _test/map2.go diff --git a/test/map3.go b/_test/map3.go similarity index 100% rename from test/map3.go rename to _test/map3.go diff --git a/test/map4.go b/_test/map4.go similarity index 100% rename from test/map4.go rename to _test/map4.go diff --git a/test/math0.go b/_test/math0.go similarity index 100% rename from test/math0.go rename to _test/math0.go diff --git a/test/method.go b/_test/method.go similarity index 100% rename from test/method.go rename to _test/method.go diff --git a/test/method0.go b/_test/method0.go similarity index 100% rename from test/method0.go rename to _test/method0.go diff --git a/test/method1.go b/_test/method1.go similarity index 100% rename from test/method1.go rename to _test/method1.go diff --git a/test/method2.go b/_test/method2.go similarity index 100% rename from test/method2.go rename to _test/method2.go diff --git a/test/method3.go b/_test/method3.go similarity index 100% rename from test/method3.go rename to _test/method3.go diff --git a/test/method4.go b/_test/method4.go similarity index 100% rename from test/method4.go rename to _test/method4.go diff --git a/test/method5.go b/_test/method5.go similarity index 100% rename from test/method5.go rename to _test/method5.go diff --git a/test/method6.go b/_test/method6.go similarity index 100% rename from test/method6.go rename to _test/method6.go diff --git a/test/method7.go b/_test/method7.go similarity index 100% rename from test/method7.go rename to _test/method7.go diff --git a/test/plugin0.go b/_test/plugin0.go similarity index 100% rename from test/plugin0.go rename to _test/plugin0.go diff --git a/test/plugin1.go b/_test/plugin1.go similarity index 100% rename from test/plugin1.go rename to _test/plugin1.go diff --git a/test/plugin2.go b/_test/plugin2.go similarity index 100% rename from test/plugin2.go rename to _test/plugin2.go diff --git a/test/provider/provider.go b/_test/provider/provider.go similarity index 100% rename from test/provider/provider.go rename to _test/provider/provider.go diff --git a/test/ptr0.go b/_test/ptr0.go similarity index 100% rename from test/ptr0.go rename to _test/ptr0.go diff --git a/test/ptr1.go b/_test/ptr1.go similarity index 100% rename from test/ptr1.go rename to _test/ptr1.go diff --git a/test/ptr2.go b/_test/ptr2.go similarity index 100% rename from test/ptr2.go rename to _test/ptr2.go diff --git a/test/ptr3.go b/_test/ptr3.go similarity index 100% rename from test/ptr3.go rename to _test/ptr3.go diff --git a/test/ptr4.go b/_test/ptr4.go similarity index 100% rename from test/ptr4.go rename to _test/ptr4.go diff --git a/test/ptr5.go b/_test/ptr5.go similarity index 100% rename from test/ptr5.go rename to _test/ptr5.go diff --git a/test/ptr5a.go b/_test/ptr5a.go similarity index 100% rename from test/ptr5a.go rename to _test/ptr5a.go diff --git a/test/ptr6.go b/_test/ptr6.go similarity index 100% rename from test/ptr6.go rename to _test/ptr6.go diff --git a/test/ret1.go b/_test/ret1.go similarity index 100% rename from test/ret1.go rename to _test/ret1.go diff --git a/test/ret2.go b/_test/ret2.go similarity index 100% rename from test/ret2.go rename to _test/ret2.go diff --git a/test/ret3.go b/_test/ret3.go similarity index 100% rename from test/ret3.go rename to _test/ret3.go diff --git a/test/run0.go b/_test/run0.go similarity index 100% rename from test/run0.go rename to _test/run0.go diff --git a/test/run1.go b/_test/run1.go similarity index 100% rename from test/run1.go rename to _test/run1.go diff --git a/test/run10.go b/_test/run10.go similarity index 100% rename from test/run10.go rename to _test/run10.go diff --git a/test/run4.go b/_test/run4.go similarity index 100% rename from test/run4.go rename to _test/run4.go diff --git a/test/run5.go b/_test/run5.go similarity index 100% rename from test/run5.go rename to _test/run5.go diff --git a/test/run6.go b/_test/run6.go similarity index 100% rename from test/run6.go rename to _test/run6.go diff --git a/test/run7.go b/_test/run7.go similarity index 100% rename from test/run7.go rename to _test/run7.go diff --git a/test/run8.go b/_test/run8.go similarity index 100% rename from test/run8.go rename to _test/run8.go diff --git a/test/run9.go b/_test/run9.go similarity index 100% rename from test/run9.go rename to _test/run9.go diff --git a/test/sample.plugin b/_test/sample.plugin similarity index 100% rename from test/sample.plugin rename to _test/sample.plugin diff --git a/test/scope0.go b/_test/scope0.go similarity index 100% rename from test/scope0.go rename to _test/scope0.go diff --git a/test/scope1.go b/_test/scope1.go similarity index 100% rename from test/scope1.go rename to _test/scope1.go diff --git a/test/scope2.go b/_test/scope2.go similarity index 100% rename from test/scope2.go rename to _test/scope2.go diff --git a/test/scope3.go b/_test/scope3.go similarity index 100% rename from test/scope3.go rename to _test/scope3.go diff --git a/test/scope4.go b/_test/scope4.go similarity index 100% rename from test/scope4.go rename to _test/scope4.go diff --git a/test/scope5.go b/_test/scope5.go similarity index 100% rename from test/scope5.go rename to _test/scope5.go diff --git a/test/scope6.go b/_test/scope6.go similarity index 100% rename from test/scope6.go rename to _test/scope6.go diff --git a/test/scope7.go b/_test/scope7.go similarity index 100% rename from test/scope7.go rename to _test/scope7.go diff --git a/test/server.go b/_test/server.go similarity index 100% rename from test/server.go rename to _test/server.go diff --git a/test/server0.go b/_test/server0.go similarity index 100% rename from test/server0.go rename to _test/server0.go diff --git a/test/server1.go b/_test/server1.go similarity index 100% rename from test/server1.go rename to _test/server1.go diff --git a/test/server1a.go b/_test/server1a.go similarity index 100% rename from test/server1a.go rename to _test/server1a.go diff --git a/test/server2.go b/_test/server2.go similarity index 100% rename from test/server2.go rename to _test/server2.go diff --git a/test/sieve.go b/_test/sieve.go similarity index 100% rename from test/sieve.go rename to _test/sieve.go diff --git a/test/sleep.go b/_test/sleep.go similarity index 100% rename from test/sleep.go rename to _test/sleep.go diff --git a/test/src0.go b/_test/src0.go similarity index 63% rename from test/src0.go rename to _test/src0.go index 7917642e..80931e63 100644 --- a/test/src0.go +++ b/_test/src0.go @@ -1,6 +1,6 @@ package main -import "github.com/containous/gi/test/provider" +import "github.com/containous/gi/_test/provider" func main() { provider.Sample() diff --git a/test/src1.go b/_test/src1.go similarity index 100% rename from test/src1.go rename to _test/src1.go diff --git a/test/str.go b/_test/str.go similarity index 100% rename from test/str.go rename to _test/str.go diff --git a/test/struct.go b/_test/struct.go similarity index 100% rename from test/struct.go rename to _test/struct.go diff --git a/test/struct0.go b/_test/struct0.go similarity index 100% rename from test/struct0.go rename to _test/struct0.go diff --git a/test/struct0a.go b/_test/struct0a.go similarity index 100% rename from test/struct0a.go rename to _test/struct0a.go diff --git a/test/struct1.go b/_test/struct1.go similarity index 100% rename from test/struct1.go rename to _test/struct1.go diff --git a/test/struct2.go b/_test/struct2.go similarity index 100% rename from test/struct2.go rename to _test/struct2.go diff --git a/test/struct3.go b/_test/struct3.go similarity index 100% rename from test/struct3.go rename to _test/struct3.go diff --git a/test/struct4.go b/_test/struct4.go similarity index 100% rename from test/struct4.go rename to _test/struct4.go diff --git a/test/struct5.go b/_test/struct5.go similarity index 100% rename from test/struct5.go rename to _test/struct5.go diff --git a/test/struct6.go b/_test/struct6.go similarity index 100% rename from test/struct6.go rename to _test/struct6.go diff --git a/test/switch.go b/_test/switch.go similarity index 100% rename from test/switch.go rename to _test/switch.go diff --git a/test/time0.go b/_test/time0.go similarity index 100% rename from test/time0.go rename to _test/time0.go diff --git a/test/time1.go b/_test/time1.go similarity index 100% rename from test/time1.go rename to _test/time1.go diff --git a/test/time2.go b/_test/time2.go similarity index 100% rename from test/time2.go rename to _test/time2.go diff --git a/test/time3.go b/_test/time3.go similarity index 100% rename from test/time3.go rename to _test/time3.go diff --git a/test/time4.go b/_test/time4.go similarity index 100% rename from test/time4.go rename to _test/time4.go diff --git a/test/time5.go b/_test/time5.go similarity index 100% rename from test/time5.go rename to _test/time5.go diff --git a/test/type0.go b/_test/type0.go similarity index 100% rename from test/type0.go rename to _test/type0.go diff --git a/test/var.go b/_test/var.go similarity index 100% rename from test/var.go rename to _test/var.go diff --git a/test/var2.go b/_test/var2.go similarity index 100% rename from test/var2.go rename to _test/var2.go diff --git a/test/var3.go b/_test/var3.go similarity index 100% rename from test/var3.go rename to _test/var3.go diff --git a/test/var4.go b/_test/var4.go similarity index 100% rename from test/var4.go rename to _test/var4.go diff --git a/test/variadic.go b/_test/variadic.go similarity index 100% rename from test/variadic.go rename to _test/variadic.go diff --git a/test/variadic0.go b/_test/variadic0.go similarity index 100% rename from test/variadic0.go rename to _test/variadic0.go diff --git a/interp/interp_test.go b/interp/interp_test.go index 76b4109f..706b402d 100644 --- a/interp/interp_test.go +++ b/interp/interp_test.go @@ -1,6 +1,6 @@ package interp -// Do not edit! File generated by ../test/gen_example.sh +// Do not edit! File generated by ../_test/gen_example.sh import "github.com/containous/gi/export" @@ -2257,7 +2257,7 @@ func Example_src0() { src := ` package main -import "github.com/containous/gi/test/provider" +import "github.com/containous/gi/_test/provider" func main() { provider.Sample()