diff --git a/Makefile b/Makefile index e30789b7..154295b0 100644 --- a/Makefile +++ b/Makefile @@ -149,18 +149,6 @@ valtest: $(JANET_TARGET) $(TEST_PROGRAMS) for f in build/*.out; do $(VALGRIND_COMMAND) "$$f" || exit; done for f in test/*.janet; do $(VALGRIND_COMMAND) ./$(JANET_TARGET) "$$f" || exit; done -################### -##### Natives ##### -################### - -natives: $(JANET_TARGET) - $(MAKE) -C natives/json - $(MAKE) -j 8 -C natives/sqlite3 - -clean-natives: - $(MAKE) -C natives/json clean - $(MAKE) -C natives/sqlite3 clean - ######################## ##### Distribution ##### ######################## @@ -189,16 +177,11 @@ install: $(JANET_TARGET) mandb $(LDCONFIG) -install-libs: natives - mkdir -p $(JANET_PATH) - cp -r lib $(JANET_PATH) - cp natives/*/*.so $(JANET_PATH) - uninstall: -rm $(BINDIR)/../$(JANET_TARGET) -rm $(LIBDIR)/../$(JANET_LIBRARY) -rm -rf $(INCLUDEDIR) $(LDCONFIG) -.PHONY: clean install repl debug valgrind test valtest emscripten dist install uninstall \ +.PHONY: clean install repl debug valgrind test valtest emscripten dist uninstall \ $(TEST_PROGRAM_PHONIES) $(TEST_PROGRAM_VALPHONIES) diff --git a/README.md b/README.md index 5fd5ebd9..6a597930 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ [![Build Status](https://travis-ci.org/bakpakin/janet.svg?branch=master)](https://travis-ci.org/bakpakin/janet) [![Appveyor Status](https://ci.appveyor.com/api/projects/status/32r7s2skrgm9ubva?svg=true)](https://ci.appveyor.com/project/bakpakin/janet) +![Janet Logo](https://raw.githubusercontent.com/bakpakin/janet/master/assets/janet-big.png) + Janet is a functional and imperative programming language and bytecode interpreter. It is a modern lisp, but lists are replaced by other data structures with better utility and performance (arrays, tables, structs, tuples). diff --git a/assets/janet-big.png b/assets/janet-big.png new file mode 100644 index 00000000..5e162acb Binary files /dev/null and b/assets/janet-big.png differ diff --git a/lib/colors.janet b/examples/colors.janet similarity index 100% rename from lib/colors.janet rename to examples/colors.janet diff --git a/lib/lazyseqs.janet b/examples/lazyseqs.janet similarity index 98% rename from lib/lazyseqs.janet rename to examples/lazyseqs.janet index d9d556a7..3ed21a7a 100644 --- a/lib/lazyseqs.janet +++ b/examples/lazyseqs.janet @@ -22,8 +22,8 @@ (:= ,state (do ;forms))))))) # Use tuples instead of structs to save memory -(def HEAD :private 0) -(def TAIL :private 1) +(def- HEAD 0) +(def- TAIL 1) (defn empty-seq "The empty sequence." diff --git a/natives/json/json.c b/natives/json/json.c index c11f92e1..4f01af33 100644 --- a/natives/json/json.c +++ b/natives/json/json.c @@ -588,7 +588,7 @@ static int json_encode(JanetArgs args) { static const JanetReg cfuns[] = { {"encode", json_encode, - "(json/encode x)\n\n" + "(json/encode x [,tab [,newline]])\n\n" "Encodes a janet value in JSON (utf-8)." }, {"decode", json_decode,