From 7ff7bab555f2ab54adebc527d849a10ac862e32e Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Sat, 5 Dec 2020 18:35:09 -0700 Subject: [PATCH] reorganize kiss into its own directory --- {src => kiss}/build-scripts/common-args.hxml | 2 +- {src => kiss}/build-scripts/common-test-args.hxml | 0 {src => kiss}/build-scripts/cpp/test-cpp.sh | 0 kiss/build-scripts/cpp/test.hxml | 3 +++ {src => kiss}/build-scripts/interp/test.hxml | 0 {src => kiss}/build-scripts/js/test.hxml | 0 {src => kiss}/build-scripts/nodejs/test.hxml | 0 {src => kiss}/build-scripts/py/test-py.sh | 0 kiss/build-scripts/py/test.hxml | 2 ++ build.hxml => kiss/build.hxml | 2 +- haxelib.json => kiss/haxelib.json | 0 {src => kiss/src}/kiss/CompileError.hx | 0 {src => kiss/src}/kiss/FieldForms.hx | 0 {src => kiss/src}/kiss/Helpers.hx | 0 {src => kiss/src}/kiss/Kiss.hx | 0 {src => kiss/src}/kiss/List.hx | 0 {src => kiss/src}/kiss/Macros.hx | 0 kiss/src/kiss/Main.hx | 4 ++++ {src => kiss/src}/kiss/Main.kiss | 0 {src => kiss/src}/kiss/Operand.hx | 0 {src => kiss/src}/kiss/Prelude.hx | 0 {src => kiss/src}/kiss/Reader.hx | 0 {src => kiss/src}/kiss/SpecialForms.hx | 0 {src => kiss/src}/kiss/Stream.hx | 0 {src => kiss/src}/test/TestMain.hx | 0 {src => kiss/src}/test/cases/BasicTestCase.hx | 2 +- {src => kiss/src}/test/cases/BasicTestCase.kiss | 0 .../src}/test/cases/CommentAtEndOfListTestCase.kiss | 0 {src => kiss/src}/test/cases/ReaderMacroTestCase.hx | 2 +- {src => kiss/src}/test/cases/ReaderMacroTestCase.kiss | 0 projects/aoc/test.sh | 2 +- projects/file-watch/test.sh | 2 +- projects/pdf-salad/test.sh | 2 +- src/build-scripts/cpp/test.hxml | 3 --- src/build-scripts/py/test.hxml | 2 -- src/kiss/Main.hx | 4 ---- test-all.sh | 4 ++-- test.sh | 6 +++--- 38 files changed, 21 insertions(+), 21 deletions(-) rename {src => kiss}/build-scripts/common-args.hxml (54%) rename {src => kiss}/build-scripts/common-test-args.hxml (100%) rename {src => kiss}/build-scripts/cpp/test-cpp.sh (100%) mode change 100755 => 100644 create mode 100644 kiss/build-scripts/cpp/test.hxml rename {src => kiss}/build-scripts/interp/test.hxml (100%) rename {src => kiss}/build-scripts/js/test.hxml (100%) rename {src => kiss}/build-scripts/nodejs/test.hxml (100%) rename {src => kiss}/build-scripts/py/test-py.sh (100%) mode change 100755 => 100644 create mode 100644 kiss/build-scripts/py/test.hxml rename build.hxml => kiss/build.hxml (81%) rename haxelib.json => kiss/haxelib.json (100%) rename {src => kiss/src}/kiss/CompileError.hx (100%) rename {src => kiss/src}/kiss/FieldForms.hx (100%) rename {src => kiss/src}/kiss/Helpers.hx (100%) rename {src => kiss/src}/kiss/Kiss.hx (100%) rename {src => kiss/src}/kiss/List.hx (100%) rename {src => kiss/src}/kiss/Macros.hx (100%) create mode 100644 kiss/src/kiss/Main.hx rename {src => kiss/src}/kiss/Main.kiss (100%) rename {src => kiss/src}/kiss/Operand.hx (100%) rename {src => kiss/src}/kiss/Prelude.hx (100%) rename {src => kiss/src}/kiss/Reader.hx (100%) rename {src => kiss/src}/kiss/SpecialForms.hx (100%) rename {src => kiss/src}/kiss/Stream.hx (100%) rename {src => kiss/src}/test/TestMain.hx (100%) rename {src => kiss/src}/test/cases/BasicTestCase.hx (98%) rename {src => kiss/src}/test/cases/BasicTestCase.kiss (100%) rename {src => kiss/src}/test/cases/CommentAtEndOfListTestCase.kiss (100%) rename {src => kiss/src}/test/cases/ReaderMacroTestCase.hx (88%) rename {src => kiss/src}/test/cases/ReaderMacroTestCase.kiss (100%) delete mode 100644 src/build-scripts/cpp/test.hxml delete mode 100644 src/build-scripts/py/test.hxml delete mode 100644 src/kiss/Main.hx diff --git a/src/build-scripts/common-args.hxml b/kiss/build-scripts/common-args.hxml similarity index 54% rename from src/build-scripts/common-args.hxml rename to kiss/build-scripts/common-args.hxml index b2e55300..9f079317 100644 --- a/src/build-scripts/common-args.hxml +++ b/kiss/build-scripts/common-args.hxml @@ -1,5 +1,5 @@ -lib hscript -lib uuid -lib tink_macro --cp src +-cp kiss/src -D analyzer-optimize \ No newline at end of file diff --git a/src/build-scripts/common-test-args.hxml b/kiss/build-scripts/common-test-args.hxml similarity index 100% rename from src/build-scripts/common-test-args.hxml rename to kiss/build-scripts/common-test-args.hxml diff --git a/src/build-scripts/cpp/test-cpp.sh b/kiss/build-scripts/cpp/test-cpp.sh old mode 100755 new mode 100644 similarity index 100% rename from src/build-scripts/cpp/test-cpp.sh rename to kiss/build-scripts/cpp/test-cpp.sh diff --git a/kiss/build-scripts/cpp/test.hxml b/kiss/build-scripts/cpp/test.hxml new file mode 100644 index 00000000..df7e0b3d --- /dev/null +++ b/kiss/build-scripts/cpp/test.hxml @@ -0,0 +1,3 @@ +-lib hxcpp +-cpp bin/cpp/test +-cmd bash kiss/build-scripts/cpp/test-cpp.sh \ No newline at end of file diff --git a/src/build-scripts/interp/test.hxml b/kiss/build-scripts/interp/test.hxml similarity index 100% rename from src/build-scripts/interp/test.hxml rename to kiss/build-scripts/interp/test.hxml diff --git a/src/build-scripts/js/test.hxml b/kiss/build-scripts/js/test.hxml similarity index 100% rename from src/build-scripts/js/test.hxml rename to kiss/build-scripts/js/test.hxml diff --git a/src/build-scripts/nodejs/test.hxml b/kiss/build-scripts/nodejs/test.hxml similarity index 100% rename from src/build-scripts/nodejs/test.hxml rename to kiss/build-scripts/nodejs/test.hxml diff --git a/src/build-scripts/py/test-py.sh b/kiss/build-scripts/py/test-py.sh old mode 100755 new mode 100644 similarity index 100% rename from src/build-scripts/py/test-py.sh rename to kiss/build-scripts/py/test-py.sh diff --git a/kiss/build-scripts/py/test.hxml b/kiss/build-scripts/py/test.hxml new file mode 100644 index 00000000..1989e692 --- /dev/null +++ b/kiss/build-scripts/py/test.hxml @@ -0,0 +1,2 @@ +--python bin/py/test.py +--cmd bash kiss/build-scripts/py/test-py.sh \ No newline at end of file diff --git a/build.hxml b/kiss/build.hxml similarity index 81% rename from build.hxml rename to kiss/build.hxml index 00fda2b8..c222b12c 100644 --- a/build.hxml +++ b/kiss/build.hxml @@ -1,4 +1,4 @@ --cp src +-cp kiss/src -lib hscript -lib uuid -lib tink_macro diff --git a/haxelib.json b/kiss/haxelib.json similarity index 100% rename from haxelib.json rename to kiss/haxelib.json diff --git a/src/kiss/CompileError.hx b/kiss/src/kiss/CompileError.hx similarity index 100% rename from src/kiss/CompileError.hx rename to kiss/src/kiss/CompileError.hx diff --git a/src/kiss/FieldForms.hx b/kiss/src/kiss/FieldForms.hx similarity index 100% rename from src/kiss/FieldForms.hx rename to kiss/src/kiss/FieldForms.hx diff --git a/src/kiss/Helpers.hx b/kiss/src/kiss/Helpers.hx similarity index 100% rename from src/kiss/Helpers.hx rename to kiss/src/kiss/Helpers.hx diff --git a/src/kiss/Kiss.hx b/kiss/src/kiss/Kiss.hx similarity index 100% rename from src/kiss/Kiss.hx rename to kiss/src/kiss/Kiss.hx diff --git a/src/kiss/List.hx b/kiss/src/kiss/List.hx similarity index 100% rename from src/kiss/List.hx rename to kiss/src/kiss/List.hx diff --git a/src/kiss/Macros.hx b/kiss/src/kiss/Macros.hx similarity index 100% rename from src/kiss/Macros.hx rename to kiss/src/kiss/Macros.hx diff --git a/kiss/src/kiss/Main.hx b/kiss/src/kiss/Main.hx new file mode 100644 index 00000000..70e280bc --- /dev/null +++ b/kiss/src/kiss/Main.hx @@ -0,0 +1,4 @@ +package kiss; + +@:build(kiss.Kiss.build("kiss/src/kiss/Main.kiss")) +class Main {} diff --git a/src/kiss/Main.kiss b/kiss/src/kiss/Main.kiss similarity index 100% rename from src/kiss/Main.kiss rename to kiss/src/kiss/Main.kiss diff --git a/src/kiss/Operand.hx b/kiss/src/kiss/Operand.hx similarity index 100% rename from src/kiss/Operand.hx rename to kiss/src/kiss/Operand.hx diff --git a/src/kiss/Prelude.hx b/kiss/src/kiss/Prelude.hx similarity index 100% rename from src/kiss/Prelude.hx rename to kiss/src/kiss/Prelude.hx diff --git a/src/kiss/Reader.hx b/kiss/src/kiss/Reader.hx similarity index 100% rename from src/kiss/Reader.hx rename to kiss/src/kiss/Reader.hx diff --git a/src/kiss/SpecialForms.hx b/kiss/src/kiss/SpecialForms.hx similarity index 100% rename from src/kiss/SpecialForms.hx rename to kiss/src/kiss/SpecialForms.hx diff --git a/src/kiss/Stream.hx b/kiss/src/kiss/Stream.hx similarity index 100% rename from src/kiss/Stream.hx rename to kiss/src/kiss/Stream.hx diff --git a/src/test/TestMain.hx b/kiss/src/test/TestMain.hx similarity index 100% rename from src/test/TestMain.hx rename to kiss/src/test/TestMain.hx diff --git a/src/test/cases/BasicTestCase.hx b/kiss/src/test/cases/BasicTestCase.hx similarity index 98% rename from src/test/cases/BasicTestCase.hx rename to kiss/src/test/cases/BasicTestCase.hx index 2880f823..0e3d8f2a 100644 --- a/src/test/cases/BasicTestCase.hx +++ b/kiss/src/test/cases/BasicTestCase.hx @@ -7,7 +7,7 @@ import kiss.List; using StringTools; -@:build(kiss.Kiss.build("src/test/cases/BasicTestCase.kiss")) +@:build(kiss.Kiss.build("kiss/src/test/cases/BasicTestCase.kiss")) class BasicTestCase extends Test { function testStaticVar() { Assert.equals("Howdy", BasicTestCase.message); diff --git a/src/test/cases/BasicTestCase.kiss b/kiss/src/test/cases/BasicTestCase.kiss similarity index 100% rename from src/test/cases/BasicTestCase.kiss rename to kiss/src/test/cases/BasicTestCase.kiss diff --git a/src/test/cases/CommentAtEndOfListTestCase.kiss b/kiss/src/test/cases/CommentAtEndOfListTestCase.kiss similarity index 100% rename from src/test/cases/CommentAtEndOfListTestCase.kiss rename to kiss/src/test/cases/CommentAtEndOfListTestCase.kiss diff --git a/src/test/cases/ReaderMacroTestCase.hx b/kiss/src/test/cases/ReaderMacroTestCase.hx similarity index 88% rename from src/test/cases/ReaderMacroTestCase.hx rename to kiss/src/test/cases/ReaderMacroTestCase.hx index 3e2efdc5..8c92679f 100644 --- a/src/test/cases/ReaderMacroTestCase.hx +++ b/kiss/src/test/cases/ReaderMacroTestCase.hx @@ -4,7 +4,7 @@ import utest.Test; import utest.Assert; import kiss.Prelude; -@:build(kiss.Kiss.build("src/test/cases/ReaderMacroTestCase.kiss")) +@:build(kiss.Kiss.build("kiss/src/test/cases/ReaderMacroTestCase.kiss")) class ReaderMacroTestCase extends Test { function testReadBang() { Assert.equals("String that takes the rest of the line", ReaderMacroTestCase.myLine()); diff --git a/src/test/cases/ReaderMacroTestCase.kiss b/kiss/src/test/cases/ReaderMacroTestCase.kiss similarity index 100% rename from src/test/cases/ReaderMacroTestCase.kiss rename to kiss/src/test/cases/ReaderMacroTestCase.kiss diff --git a/projects/aoc/test.sh b/projects/aoc/test.sh index 9eca0367..7d998f43 100755 --- a/projects/aoc/test.sh +++ b/projects/aoc/test.sh @@ -1,4 +1,4 @@ #! /bin/bash -haxelib dev kiss ../../ +haxelib dev kiss ../../kiss haxe build.hxml \ No newline at end of file diff --git a/projects/file-watch/test.sh b/projects/file-watch/test.sh index db06c5f3..23a938cb 100755 --- a/projects/file-watch/test.sh +++ b/projects/file-watch/test.sh @@ -1,6 +1,6 @@ #! /bin/bash -haxelib dev kiss ../../ +haxelib dev kiss ../../kiss echo "" > test-output.txt expected=$'hey\nhey\nhey' if [[ $(uname) == *"MINGW"* ]] || [ $TRAVIS_OS_NAME = "windows" ]; then diff --git a/projects/pdf-salad/test.sh b/projects/pdf-salad/test.sh index cec38e45..f8ad7703 100755 --- a/projects/pdf-salad/test.sh +++ b/projects/pdf-salad/test.sh @@ -3,5 +3,5 @@ if [ ! -z "$TRAVIS_OS_NAME" ]; then npm install pdf-lib fi -haxelib dev kiss ../../ +haxelib dev kiss ../../kiss haxe build.hxml \ No newline at end of file diff --git a/src/build-scripts/cpp/test.hxml b/src/build-scripts/cpp/test.hxml deleted file mode 100644 index 1ad5852b..00000000 --- a/src/build-scripts/cpp/test.hxml +++ /dev/null @@ -1,3 +0,0 @@ --lib hxcpp --cpp bin/cpp/test --cmd bash src/build-scripts/cpp/test-cpp.sh \ No newline at end of file diff --git a/src/build-scripts/py/test.hxml b/src/build-scripts/py/test.hxml deleted file mode 100644 index 9f09df4d..00000000 --- a/src/build-scripts/py/test.hxml +++ /dev/null @@ -1,2 +0,0 @@ ---python bin/py/test.py ---cmd bash src/build-scripts/py/test-py.sh \ No newline at end of file diff --git a/src/kiss/Main.hx b/src/kiss/Main.hx deleted file mode 100644 index 01b174b7..00000000 --- a/src/kiss/Main.hx +++ /dev/null @@ -1,4 +0,0 @@ -package kiss; - -@:build(kiss.Kiss.build("src/kiss/Main.kiss")) -class Main {} diff --git a/test-all.sh b/test-all.sh index 0a28659b..7a6d1b33 100755 --- a/test-all.sh +++ b/test-all.sh @@ -4,12 +4,12 @@ # Dependencies won't be installed first # Test the Kiss compiler on every target language: -TEST_FILES=src/build-scripts/**/test.hxml +TEST_FILES=kiss/build-scripts/**/test.hxml for TEST_FILE in $TEST_FILES do echo $TEST_FILE - haxe src/build-scripts/common-args.hxml src/build-scripts/common-test-args.hxml $TEST_FILE + haxe kiss/build-scripts/common-args.hxml kiss/build-scripts/common-test-args.hxml $TEST_FILE if [ ! $? -eq 0 ] then exit 1 diff --git a/test.sh b/test.sh index 3faae1c1..5a63c0f9 100755 --- a/test.sh +++ b/test.sh @@ -10,9 +10,9 @@ else # For CI tests, force install the dependencies if [ ! -z "$TRAVIS_OS_NAME" ] then - (cd src/build-scripts && haxelib install all --always) - (cd src/build-scripts/$KISS_TARGET && haxelib install all --always) + (cd kiss/build-scripts && haxelib install all --always) + (cd kiss/build-scripts/$KISS_TARGET && haxelib install all --always) fi - haxe src/build-scripts/common-args.hxml src/build-scripts/common-test-args.hxml src/build-scripts/$KISS_TARGET/test.hxml + haxe kiss/build-scripts/common-args.hxml kiss/build-scripts/common-test-args.hxml kiss/build-scripts/$KISS_TARGET/test.hxml fi \ No newline at end of file