From f780df0aa6091738fe9fa94bc288d8bf19edfc53 Mon Sep 17 00:00:00 2001 From: Calvin Rose Date: Sat, 5 Oct 2019 20:35:11 -0500 Subject: [PATCH] Fix single threaded build option with meson. By default, was building with the opposite of what was provided. --- meson.build | 2 +- src/boot/boot.janet | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 0c7e7b41..3752417a 100644 --- a/meson.build +++ b/meson.build @@ -52,7 +52,7 @@ conf.set_quoted('JANET_VERSION', meson.project_version()) # Use options conf.set_quoted('JANET_BUILD', get_option('git_hash')) conf.set('JANET_NO_NANBOX', not get_option('nanbox')) -conf.set('JANET_SINGLE_THREADED', not get_option('single_threaded')) +conf.set('JANET_SINGLE_THREADED', get_option('single_threaded')) conf.set('JANET_NO_DYNAMIC_MODULES', not get_option('dynamic_modules')) conf.set('JANET_NO_DOCSTRINGS', not get_option('docstrings')) conf.set('JANET_NO_SOURCEMAPS', not get_option('sourcemaps')) diff --git a/src/boot/boot.janet b/src/boot/boot.janet index 256f1b61..021628d5 100644 --- a/src/boot/boot.janet +++ b/src/boot/boot.janet @@ -1358,7 +1358,8 @@ (def d (x :doc)) (print "\n\n" (if d bind-type "") - (if-let [[path start end] sm] (string " " path " (" start ":" end ")\n") "") + (if-let [[path line col] sm] + (string " " path " on line " line ", column " col "\n") "") (if (or d sm) "\n" "") (if d (doc-format d) "no documentation found.") "\n\n"))))