From 26818a5e5c2f9ed6988372d6bf8a6dbf9fd4a7e7 Mon Sep 17 00:00:00 2001 From: Calvin Rose Date: Fri, 18 Jan 2019 12:24:12 -0500 Subject: [PATCH] Fix doc generation. --- src/core/core.janet | 4 ++-- tools/gendoc.janet | 2 +- tools/highlight.janet | 2 +- tools/marshal_core.janet | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core/core.janet b/src/core/core.janet index 7def9d7c..f141a531 100644 --- a/src/core/core.janet +++ b/src/core/core.janet @@ -1451,7 +1451,7 @@ value, one key will be ignored." where)))) (if (= (parser/status p) :pending) - (onstatus :parse + (onstatus :parse (string "unmatched delimiters " (parser/state p)) nil where)) @@ -1539,7 +1539,7 @@ value, one key will be ignored." "The list of paths to look for modules. The followig substitutions are preformed on each path. :sys: becomes module/*syspath*, :name: becomes the last part of the module - name after the last /, and :all: is the module name literally. + name after the last /, and :all: is the module name literally. :native: becomes the dynamic library file extension, usually dll or so." @["./:all:.janet" diff --git a/tools/gendoc.janet b/tools/gendoc.janet index 490a01f4..48ae879f 100644 --- a/tools/gendoc.janet +++ b/tools/gendoc.janet @@ -89,7 +89,7 @@ # Generate parts and print them to stdout (def parts (seq [[k entry] - :in (sort (pairs (table/getproto _env))) + :in (sort (pairs (table/getproto *env*))) :when (and (get entry :doc) (not (get entry :private)))] (emit-item k entry))) (print diff --git a/tools/highlight.janet b/tools/highlight.janet index 7643e935..3b08c2ac 100644 --- a/tools/highlight.janet +++ b/tools/highlight.janet @@ -5,7 +5,7 @@ # Constants for checking if symbols should be # highlighted. -(def- core-env (table/getproto _env)) +(def- core-env (table/getproto *env*)) (def- specials {'fn true 'var true 'do true diff --git a/tools/marshal_core.janet b/tools/marshal_core.janet index 21534e1f..a5415f05 100644 --- a/tools/marshal_core.janet +++ b/tools/marshal_core.janet @@ -10,11 +10,11 @@ # can be written to an image (no cfunctions, no abstracts (stdout, stdin, stderr)), # everything else goes. Cfunctions and abstracts will be referenced from a register # table which will be generated on janet startup. -(def image (let [env-pairs (pairs (env-lookup _env)) +(def image (let [env-pairs (pairs (env-lookup *env*)) essential-pairs (filter (fn [[k v]] (or (cfunction? v) (abstract? v))) env-pairs) lookup (table ;(mapcat identity essential-pairs)) reverse-lookup (invert lookup)] - (marshal (table/getproto _env) reverse-lookup))) + (marshal (table/getproto *env*) reverse-lookup))) # Write image (file/write stdout image)