diff options
| author |  Calvin Rose <calsrose@gmail.com> | 2018-12-22 16:24:08 -0500 |
|---|---|---|
| committer | Calvin Rose <calsrose@gmail.com> | 2018-12-22 16:24:08 -0500 |
| commit | 9723ddb96bb4f38277babc62d54b62e4e993f26a (patch) | |
| tree | 9a18a6b7dee0e7f0a40ada0a42dc42be94228b8b | |
| parent | Merge branch 'master' of https://github.com/bakpakin/janet (diff) | |
Fix string/number issue.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rw-r--r-- | build_win.bat | 1 | ||||
| -rw-r--r-- | janet-installer.nsi (renamed from janet.nsi) | 2 | ||||
| -rw-r--r-- | src/include/janet/janet.h | 29 |
6 files changed, 20 insertions, 17 deletions
@@ -10,6 +10,7 @@ janet /Emscripten /src/include/generated/*.h janet-*.tar.gz +dist # Emscripten *.bc @@ -157,7 +157,7 @@ dist: build/janet-dist.tar.gz build/janet-%.tar.gz: $(JANET_TARGET) src/include/janet/janet.h \ janet.1 LICENSE CONTRIBUTING.md $(JANET_LIBRARY) \ - build/doc.html README.md $(wildcard doc/*) + build/doc.html README.md $(wildcard doc/*.md) tar -czvf $@ $^ ######################### diff --git a/appveyor.yml b/appveyor.yml index c8243a46..320c9c47 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,6 +21,8 @@ install: - build_win - build_win test - build_win dist + - choco install nsis -y -pre + - call "C:\Program Files (x86)\NSIS\makensis.exe" janet-installer.nsi build: off diff --git a/build_win.bat b/build_win.bat index a5f6483f..1169d393 100644 --- a/build_win.bat +++ b/build_win.bat @@ -100,7 +100,6 @@ copy README.md dist\README.md copy janet.lib dist\janet.lib copy janet.exp dist\janet.exp copy src\include\janet\janet.h dist\janet.h -xcopy /s doc dist\doc exit /b 0 :TESTFAIL diff --git a/janet.nsi b/janet-installer.nsi index f4c9cf56..a7b74712 100644 --- a/janet.nsi +++ b/janet-installer.nsi @@ -6,7 +6,7 @@ !include "MUI2.nsh" Name "Janet" -OutFile "janet.exe" +OutFile "janet-install.exe" !define MUI_ABORTWARNING diff --git a/src/include/janet/janet.h b/src/include/janet/janet.h index f3a6cddd..5e5e74df 100644 --- a/src/include/janet/janet.h +++ b/src/include/janet/janet.h @@ -1158,8 +1158,8 @@ JANET_API int janet_typeabstract_err(JanetArgs args, int32_t n, const JanetAbstr } while (0) #define JANET_CHECKMANY(A, N, TS) do {\ if ((A).n > (N)) {\ - JanetType t = janet_type((A).v[(N)]);\ - if (!((1 << t) & (TS))) return janet_typemany_err(A, N, TS);\ + JanetType _t_ = janet_type((A).v[(N)]);\ + if (!((1 << _t_) & (TS))) return janet_typemany_err(A, N, TS);\ } else {\ if (!((TS) & JANET_NIL)) return janet_typemany_err(A, N, TS);\ }\ @@ -1167,9 +1167,9 @@ JANET_API int janet_typeabstract_err(JanetArgs args, int32_t n, const JanetAbstr #define JANET_CHECKABSTRACT(A, N, AT) do {\ if ((A).n > (N)) {\ - Janet x = (A).v[(N)];\ - if (!janet_checktype(x, JANET_ABSTRACT) ||\ - janet_abstract_type(janet_unwrap_abstract(x)) != (AT))\ + Janet _x_ = (A).v[(N)];\ + if (!janet_checktype(_x_, JANET_ABSTRACT) ||\ + janet_abstract_type(janet_unwrap_abstract(_x_)) != (AT))\ return janet_typeabstract_err(A, N, AT);\ } else {\ return janet_typeabstract_err(A, N, AT);\ @@ -1177,15 +1177,16 @@ JANET_API int janet_typeabstract_err(JanetArgs args, int32_t n, const JanetAbstr } while (0) #define JANET_ARG_NUMBER(DEST, A, N) do { \ - if ((A).n <= (N)) \ - return janet_typemany_err(A, N, JANET_TFLAG_NUMBER);\ - Janet val = (A).v[(N)];\ - if (janet_checktype(val, JANET_REAL)) { \ - DEST = janet_unwrap_real(val); \ - } else if (janet_checktype(val, JANET_INTEGER)) {\ - DEST = (double) janet_unwrap_integer(val);\ - }\ - else return janet_typemany_err(A, N, JANET_TFLAG_NUMBER); \ + if ((A).n <= (N)) return janet_typemany_err(A, N, JANET_TFLAG_NUMBER); \ + Janet _val_ = (A).v[(N)];\ + JanetType _type_ = janet_type(_val_); \ + if (_type_ == JANET_REAL) { \ + DEST = janet_unwrap_real(_val_); \ + } else if (_type_ == JANET_INTEGER) {\ + DEST = (double) janet_unwrap_integer(_val_);\ + } else { \ + return janet_typemany_err(A, N, JANET_TFLAG_NUMBER); \ + } \ } while (0) #define JANET_ARG_BOOLEAN(DEST, A, N) do { \ |