all repos — min @ 86ef5b25a0919a3c26d96ff3c316af6cc5ea9424

A small but practical concatenative programming language.

Merge branch 'master' into next
h3rald h3rald@h3rald.com
Mon, 18 Jan 2021 22:16:37 +0000
commit

86ef5b25a0919a3c26d96ff3c316af6cc5ea9424

parent

40bc779c15e476705077295395867d790ed922ee

7 files changed, 15 insertions(+), 9 deletions(-)

jump to
M .gitignore.gitignore

@@ -19,3 +19,4 @@ response.json

run run.nim dstore.json +test.min
M min.nimsmin.nims

@@ -1,11 +1,9 @@

-# https", //blog.filippo.io/easy-windows-and-linux-cross-compilers-for-macos/ +# https://blog.filippo.io/easy-windows-and-linux-cross-compilers-for-macos/ -# https", //gist.github.com/Drakulix/9881160 switch("amd64.windows.gcc.path", "/usr/local/bin") switch("amd64.windows.gcc.exe", "x86_64-w64-mingw32-gcc") switch("amd64.windows.gcc.linkerexe", "x86_64-w64-mingw32-gcc") -# http", //crossgcc.rts-software.org/doku.php?id=compiling_for_linux switch("amd64.linux.gcc.path", "/usr/local/bin") switch("amd64.linux.gcc.exe", "x86_64-linux-musl-gcc") switch("amd64.linux.gcc.linkerexe", "x86_64-linux-musl-gcc")
M min.vimmin.vim

@@ -1,8 +1,8 @@

" Vim syntax file " Language: min " Maintainer: Fabio Cevasco -" Last Change: 17 Jan 2021 -" Version: 0.29.0 +" Last Change: 18 Jan 2021 +" Version: 0.29.1 if exists("b:current_syntax") finish

@@ -11,7 +11,7 @@

setl iskeyword=@,36-39,+,-,*,.,/,:,~,!,48-57,60-65,94-95,192-255 setl iskeyword+=^ -syntax keyword minDefaultSymbol ! !! != # $ % & && ' * + - -> -inf . .. / : :: < <= = =% =-= == ==> => =~ > >< >= >> @ ROOT ^ abs accept acos aes all? and any? append apply apply-interpolate args asin ask atan atime bind bool boolean? call capitalize case cd ceil chmod choose chr clear clear-stack cleave close column-print compiled? concat confirm connect cons cos cosh cp cpu crypto ctime d2r datetime ddel ddup debug debug! decode decode-url define define-sigil defined-sigil? defined? delete delete-sigil dequote dget dhas? dict dictionary? difference dip dir? dirname div dkeys download dpairs dpick drop dsdelete dsdelete! dset dsget dshas? dsinit dsinit! dspost dspost! dsput dsput! dsquery dsread dstore dswrite dswrite! dtype dup dvalues e encode encode-url env? error error! escape eval even? exists? exit expect expect-all expect-any expect-empty-stack fappend fatal fatal! file? filename filter find first flatten float float? floor foreach format-error fperms fread from-json from-semver from-yaml fs fsize fstats ftype fwrite get get-content get-env get-stack getchr gets hardlink harvest hidden? http id if import in? indent indexof inf infix-dequote info info! insert int integer? interpolate intersection invoke io join keep last length line-info linrec listen lite? ln load load-symbol log10 log2 logic loglevel loglevel? lowercase ls ls-r map map-reduce mapkey match math md4 md5 mini? mkdir mod module mtime mv nan net newline nip not notice notice! now null? num number? odd? one? operator opts or ord os over parse parse-url partition password pi pick pop pow pred prefix prefix-dequote prepend print print! prompt publish put-env putchr puts puts! quit quotation? quote quote-bind quote-define quote-map r2g raise random randomize raw-args recv recv-line reduce regex reject remove remove-symbol repeat replace request require rest return reverse rm rmdir rolldown rollup round run save-symbol saved-symbols scope scope-sigils scope-symbols seal seal-sigil sealed-sigil? sealed? search semver-inc-major semver-inc-minor semver-inc-patch semver? send seq set set-stack set-type sha1 sha224 sha256 sha384 sha512 shorten sigils sin sinh sip size sleep slice socket sort source split spread sqrt stack start-server stop-server str string string? stringlike? strip substr succ suffix sum swap swons symbols symlink symlink? symmetric-difference sys system system! take tan tanh tap tap! tau tformat time timeinfo times timestamp titleize to-json to-semver to-timestamp to-yaml trunc try type type? typeclass union unless unmapkey unseal unseal-sigil unzip uppercase version warn warn! when which while with xor zip || +syntax keyword minDefaultSymbol ! !! != # $ % & && ' * + - -> -inf . .. / : :: < <= = =% =-= == ==> => =~ > >< >= >> @ ROOT ^ accept acos aes all? and any? append apply apply-interpolate args asin ask atan atime bind bool boolean? call capitalize case cd ceil chmod choose chr clear clear-stack cleave close column-print compiled? concat confirm connect cons cos cosh cp cpu crypto ctime d2r datetime ddel ddup debug debug! decode decode-url define define-sigil defined-sigil? defined? delete delete-sigil dequote dget dhas? dict dictionary? difference dip dir? dirname div dkeys download dpairs dpick drop dsdelete dsdelete! dset dsget dshas? dsinit dspost dspost! dsput dsput! dsquery dsread dstore dswrite dswrite! dtype dup dvalues e encode encode-url env? error error! escape eval even? exists? exit expect expect-all expect-any expect-empty-stack fappend fatal fatal! file? filename filter find first flatten float float? floor foreach format-error fperms fread from-json from-semver from-yaml fs fsize fstats ftype fwrite get get-content get-env get-stack getchr gets hardlink harvest hidden? http id if import in? indent indexof inf infix-dequote info info! insert int integer? interpolate intersection invoke io join keep last length line-info linrec listen lite? ln load load-symbol log10 log2 logic loglevel loglevel? lowercase ls ls-r map map-reduce mapkey match math md4 md5 mini? mkdir mod module mtime mv nan net newline nip not notice notice! now null? num number? odd? one? operator opts or ord os over parse parse-url partition password pi pick pop pow pred prefix prefix-dequote prepend print print! prompt publish put-env putchr puts puts! quit quotation? quote quote-bind quote-define quote-map r2g raise random randomize raw-args recv recv-line reduce regex reject remove remove-symbol repeat replace request require rest return reverse rm rmdir rolldown rollup round run save-symbol saved-symbols scope scope-sigils scope-symbols seal seal-sigil search semver-inc-major semver-inc-minor semver-inc-patch semver? send seq set set-stack set-type sha1 sha224 sha256 sha384 sha512 shorten sigils sin sinh sip size sleep slice socket sort source split spread sqrt stack start-server stop-server str string string? strip substr succ suffix sum swap swons symbols symlink symlink? symmetric-difference sys system system! take tan tanh tap tap! tau tformat time timeinfo times timestamp titleize to-json to-semver to-timestamp to-yaml trunc try type type? union unless unmapkey unseal unseal-sigil unzip uppercase version warn warn! when which while with xor zip || syntax match minDefaultSigil ;\<[/:@'~!?$%&=<>#^*#+]; contained syntax match minQuote ;\<['];
M min.ymlmin.yml

@@ -1,5 +1,4 @@

author: Fabio Cevasco description: A tiny concatenative programming language and shell. -id: 36521912 name: min -version: 0.30.0+version: 0.30.0
M minpkg/core/utils.nimminpkg/core/utils.nim

@@ -241,7 +241,7 @@ return true

if i.scope.hasSymbol("type:$#" % s): return true for tt in s.split("|"): - if not ts.contains(tt) or tt.startsWith("dict:"): + if not ts.contains(tt) and not tt.startsWith("dict:") and not i.scope.hasSymbol("type:$#" % tt): return false return true
M next-release.mdnext-release.md

@@ -0,0 +1,4 @@

+<<<<<<< HEAD +======= +* Fixes #98. +>>>>>>> master
M site/settings.jsonsite/settings.json

@@ -6,5 +6,9 @@ "rules": "rules.min",

"temp": "temp", "templates": "templates", "title": "min language", +<<<<<<< HEAD "version": "0.30.0" +======= + "version": "0.29.1" +>>>>>>> master }