From d393ee2ab9f029ce6b126c238e0eb6c418dfc458 Mon Sep 17 00:00:00 2001 From: fennecdjay Date: Sun, 13 Oct 2019 19:30:09 +0200 Subject: [PATCH] :art: Fix and Update --- Makefile | 2 +- scripts/doc-config.sh | 13 ++++++++++--- src/lib/import.c | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 1e539322..4d954979 100644 --- a/Makefile +++ b/Makefile @@ -121,7 +121,7 @@ test: coverity: $(shell git branch | grep "*" | cut -d" " -f2 > .branch) [ -z "$(git ls-remote --heads $(git remote get-url origin) coverity_scan)" ] || git push origin :coverity_scan - git show-ref --verify --quiet refs/heads/master && git branch -D coverity_scan + git show-ref --verify --quiet refs/heads/master && git branch -D coverity_scan || echo "" git checkout -b coverity_scan git push --set-upstream origin coverity_scan git checkout $(cat .branch) diff --git a/scripts/doc-config.sh b/scripts/doc-config.sh index 01067a63..2a8ddd41 100644 --- a/scripts/doc-config.sh +++ b/scripts/doc-config.sh @@ -10,14 +10,21 @@ list_dir() { do if [ -d "$a" ] then [[ "$a" == */"assets" ]] || - echo "$2- '$(basename "$a" | sed 's/[0-9][0-9]_//' | sed 's/_/ /g' | sed 's/-/ /g')':"; list_dir "$a" "$2" - else echo "$a" | grep "\.md$" >/dev/null && echo "$2- '$(title "$a")': ${a:5}" + echo "$2- '$(basename "$a" | sed 's/[0-9][0-9]_//' | sed 's/_/ /g' | sed 's/-/ /g')':"; + list_dir "$a" "$2"' ' + else + TITLE=$(title "$a") + if [ ! -z "$TITLE" ] + then +echo "$a" | grep "\.md$" >/dev/null && echo "$2- '$(title "$a")': ${a:5}" + fi fi done } echo "site_name: Gwion" -echo "theme: windmill" +#echo "theme: windmill" +echo "theme: readthedocs" echo "repo_url: https://github.com/fennecdjay/Gwion" echo "site_description: a strongly timed musical programming language" echo "site_author: Jérémie Astor" diff --git a/src/lib/import.c b/src/lib/import.c index dc3a0727..0744743c 100644 --- a/src/lib/import.c +++ b/src/lib/import.c @@ -607,7 +607,7 @@ ANN static Exp make_exp(const Gwi gwi, const m_str type, const m_str name) { const Env env = gwi->gwion->env; m_uint array_depth; Array_Sub array = NULL; - CHECK_OO(const ID_List, id_list, = str2list(env, type, &array_depth, gwi->loc)) + DECL_OO(const ID_List, id_list, = str2list(env, type, &array_depth, gwi->loc)) if(array_depth) { array = new_array_sub(env->gwion->mp, NULL); array->depth = array_depth; -- 2.43.0