Merge branch 'master' of https://github.com/h3rald/min
h3rald h3rald@h3rald.com
Thu, 02 Nov 2017 08:29:26 +0000
2 files changed,
342 insertions(+),
341 deletions(-)
M
Min_DeveloperGuide.htm
→
Min_DeveloperGuide.htm
@@ -2662,7 +2662,7 @@ text-shadow: 0 1px 0 rgba(255, 255, 255, 0.8);
color: #333; background-color: #f8f8f8; border: 1px solid #ccc; - white-space: pre; + white-space: pre-wrap; margin: auto; font-family: "Source Code Pro", "Monaco", "DejaVu Sans Mono", "Courier New", monospace; padding: 0;@@ -3262,7 +3262,7 @@ text-shadow: 0 1px 0 rgba(255, 255, 255, 0.8);
color: #eee; background-color: #222; border: 1px solid #ccc; - white-space: pre; + white-space: pre-wrap; padding: 0 3px; border: 2px solid #999; border-top: 10px solid #999;@@ -3315,7 +3315,7 @@ text-shadow: 0 1px 0 rgba(255, 255, 255, 0.8);
color: #eee; background-color: #222; border: 1px solid #ccc; - white-space: pre; + white-space: pre-wrap; padding: 0 3px; border: 2px solid #999; border-top: 10px solid #999;@@ -5232,15 +5232,15 @@ <p>Note that the <code>mindym.nim</code> file contains the signatures of all the <code>proc</code>s that are commonly used to define min modules, but not their implementation. Such <code>proc</code>s will become available at run time when the dynamic library is linked to the min executable.</p>
<p>You can compile the following library by running the following command:</p> -<div class="min-terminal"><p><span class="prompt">$</span> nim c –app:lib -d:release –noMain dyntest.nim</p></div> +<div class="min-terminal"><p><span class="prompt">$</span> nim c --app:lib -d:release --noMain dyntest.nim</p></div> <p>If you are using <a href="https://clang.llvm.org/">clang</a> to compile Nim code, you may need to run the following command instead:</p> -<div class="min-terminal"><p><span class="prompt">$</span> nim c –app:lib -d:release –noMain -l:“-undefined dynamic_lookup” dyntest.nim</p></div> +<div class="min-terminal"><p><span class="prompt">$</span> nim c --app:lib -d:release --noMain -l:"-undefined dynamic_lookup" dyntest.nim</p></div> <p>Now you should have a <code>libdyntest.so|dyn|dll</code> file. To make min load it and link it automatically when it starts, just run:</p> -<div class="min-terminal"><p><span class="prompt">$</span> min –install:libdyntest.dyn</p></div> +<div class="min-terminal"><p><span class="prompt">$</span> min --install:libdyntest.dyn</p></div> <p>This command will copy the library file to <code>$HOME/.minlibs/</code> (<code>%HOMEPATH%\.minlibs\</code> on Windows). min looks for dynamic libraries in this folder when it starts.</p>@@ -5254,7 +5254,7 @@ </div>
<p>If you wish to uninstall the library, run the following command instead:</p> -<div class="min-terminal"><p><span class="prompt">$</span> min –uninstall:libdyntest.dyn</p></div> +<div class="min-terminal"><p><span class="prompt">$</span> min --uninstall:libdyntest.dyn</p></div> <a name="Reference"></a> <h2>Reference<a href="#document-top" title="Go to top"></a></h2>@@ -7783,7 +7783,7 @@
<p>Truncates <span class="kwd">num</span> to the decimal point.</p></div> </div> <div id="footer"> - <p><span class="copy"></span> Fabio Cevasco – October 29, 2017</p> + <p><span class="copy"></span> Fabio Cevasco – November 2, 2017</p> <p><span>Powered by</span> <a href="https://h3rald.com/hastyscribe"><span class="hastyscribe"></span></a></p> </div> </div>
M
min.nim
→
min.nim
@@ -1,333 +1,334 @@
-when not defined(windows): - {.passL: "-rdynamic".} -import - streams, - critbits, - parseopt2, - strutils, - os, - ospaths, - json, - sequtils, - algorithm, - logging, - dynlib - -import - packages/nimline/nimline, - packages/niftylogger, - core/consts, - core/parser, - core/value, - core/scope, - core/interpreter, - core/utils -import - lib/min_lang, - lib/min_stack, - lib/min_seq, - lib/min_num, - lib/min_str, - lib/min_logic, - lib/min_time, - lib/min_io, - lib/min_sys, - lib/min_fs - -when not defined(lite): - import lib/min_crypto - import lib/min_math - -export - parser, - interpreter, - utils, - niftylogger, - value, - scope, - min_lang - -const PRELUDE* = "prelude.min".slurp.strip - -newNiftyLogger().addHandler() - -proc getExecs(): seq[string] = - var res = newSeq[string](0) - let getFiles = proc(dir: string) = - for c, s in walkDir(dir, true): - if (c == pcFile or c == pcLinkToFile) and not res.contains(s): - res.add s - getFiles(getCurrentDir()) - for dir in "PATH".getEnv.split(PathSep): - getFiles(dir) - res.sort(system.cmp) - return res - -proc getCompletions(ed: LineEditor, symbols: seq[string]): seq[string] = - var words = ed.lineText.split(" ") - var word: string - if words.len == 0: - word = ed.lineText - else: - word = words[words.len-1] - if word.startsWith("'"): - return symbols.mapIt("'" & $it) - elif word.startsWith("~"): - return symbols.mapIt("~" & $it) - if word.startsWith("@"): - return symbols.mapIt("@" & $it) - if word.startsWith("#"): - return symbols.mapIt("#" & $it) - if word.startsWith(">"): - return symbols.mapIt(">" & $it) - if word.startsWith("*"): - return symbols.mapIt("*" & $it) - if word.startsWith("("): - return symbols.mapIt("(" & $it) - if word.startsWith("<"): - return toSeq(MINSYMBOLS.readFile.parseJson.pairs).mapIt("<" & $it[0]) - if word.startsWith("$"): - return toSeq(envPairs()).mapIt("$" & $it[0]) - if word.startsWith("!"): - return getExecs().mapIt("!" & $it) - if word.startsWith("&"): - return getExecs().mapIt("&" & $it) - if word.startsWith("\""): - var f = word[1..^1] - if f == "": - f = getCurrentDir().replace("\\", "/") - return toSeq(walkDir(f, true)).mapIt("\"$1" % it.path.replace("\\", "/")) - elif f.dirExists: - f = f.replace("\\", "/") - if f[f.len-1] != '/': - f = f & "/" - return toSeq(walkDir(f, true)).mapIt("\"$1$2" % [f, it.path.replace("\\", "/")]) - else: - var dir: string - if f.contains("/") or dir.contains("\\"): - dir = f.parentDir - let file = f.extractFileName - return toSeq(walkDir(dir, true)).filterIt(it.path.toLowerAscii.startsWith(file.toLowerAscii)).mapIt("\"$1/$2" % [dir, it.path.replace("\\", "/")]) - else: - dir = getCurrentDir() - return toSeq(walkDir(dir, true)).filterIt(it.path.toLowerAscii.startsWith(f.toLowerAscii)).mapIt("\"$1" % [it.path.replace("\\", "/")]) - return symbols - -proc stdLib*(i: In) = - if not MINSYMBOLS.fileExists: - MINSYMBOLS.writeFile("{}") - if not MINHISTORY.fileExists: - MINHISTORY.writeFile("") - if not MINRC.fileExists: - MINRC.writeFile("") - i.lang_module - i.stack_module - i.seq_module - i.io_module - i.logic_module - i.num_module - i.str_module - i.sys_module - i.time_module - i.fs_module - when not defined(lite): - i.crypto_module - i.math_module - i.eval PRELUDE, "<prelude>" - i.eval MINRC.readFile() - i.eval "\"prompt\" unseal" - -type - LibProc = proc(i: In) {.nimcall.} - -proc dynLib*(i: In) = - discard MINLIBS.existsOrCreateDir - for library in walkFiles(MINLIBS & "/*"): - var modname = library.splitFile.name - var libfile = library.splitFile.name & library.splitFile.ext - if modname.len > 3 and modname[0..2] == "lib": - modname = modname[3..modname.len-1] - let dll = library.loadLib() - if dll != nil: - let modsym = dll.symAddr(modname) - if modsym != nil: - let modproc = cast[LibProc](dll.symAddr(modname)) - i.modproc() - info("[$1] Dynamic module loaded successfully: $2" % [libfile, modname]) - else: - warn("[$1] Library does not contain symbol $2" % [libfile, modname]) - else: - warn("Unable to load dynamic library: " & libfile) - -proc interpret*(i: In, s: Stream) = - i.stdLib() - i.dynLib() - i.open(s, i.filename) - discard i.parser.getToken() - try: - i.interpret() - except: - discard - i.close() - -proc minStream(s: Stream, filename: string) = - var i = newMinInterpreter(filename = filename) - i.pwd = filename.parentDir - i.interpret(s) - -proc minString*(buffer: string) = - minStream(newStringStream(buffer), "input") - -proc minFile*(filename: string) = - var fileLines = newSeq[string](0) - var contents = "" - try: - fileLines = filename.readFile().splitLines() - except: - fatal("Cannot read from file: "& filename) - quit(3) - - if fileLines[0].len >= 2 and fileLines[0][0..1] == "#!": - contents = fileLines[1..fileLines.len-1].join("\n") - else: - contents = fileLines.join("\n") - minStream(newStringStream(contents), filename) - -proc minFile*(file: File, filename="stdin") = - var stream = newFileStream(stdin) - if stream == nil: - fatal("Cannot read from file: "& filename) - quit(3) - minStream(stream, filename) - -proc printResult(i: In, res: MinValue) = - if res.isNil: - return - if i.stack.len > 0: - let n = $i.stack.len - if res.isQuotation and res.qVal.len > 1: - echo "{$1} -> (" % n - for item in res.qVal: - echo " " & $item - echo " ".repeat(n.len) & " )" - else: - echo "{$1} -> $2" % [$i.stack.len, $i.stack[i.stack.len - 1]] - -proc minRepl*(i: var MinInterpreter) = - i.stdLib() - i.dynLib() - var s = newStringStream("") - i.open(s, "<repl>") - var line: string - #echo "$1 v$2" % [appname, version] - var ed = initEditor(historyFile = MINHISTORY) - while true: - let symbols = toSeq(i.scope.symbols.keys) - ed.completionCallback = proc(ed: LineEditor): seq[string] = - return ed.getCompletions(symbols) - # evaluate prompt - i.push("prompt".newSym) - let vals = i.expect("string") - let v = vals[0] - let prompt = v.getString() - line = ed.readLine(prompt) - i.parser.bufpos = 0 - i.parser.buf = $line - i.parser.bufLen = i.parser.buf.len - discard i.parser.getToken() - try: - i.printResult i.interpret() - except: - discard - -proc minRepl*() = - var i = newMinInterpreter(filename = "<repl>") - i.minRepl - -when isMainModule: - - var REPL = false - var INSTALL = false - var UNINSTALL = false - var libfile = "" - - let usage* = """ $1 v$2 - a tiny concatenative shell and programming language - (c) 2014-2017 Fabio Cevasco - - Usage: - min [options] [filename] - - Arguments: - filename A $1 file to interpret (default: STDIN). - Options: - --install:<lib> Install dynamic library file <lib> - --uninstall:<lib> Uninstall dynamic library file <lib> - -e, --evaluate Evaluate a $1 program inline - -h, --help Print this help - -v, --version Print the program version - -i, --interactive Start $1 shell""" % [appname, version] - - var file, s: string = "" - setLogFilter(lvlNotice) - - for kind, key, val in getopt(): - case kind: - of cmdArgument: - file = key - of cmdLongOption, cmdShortOption: - case key: - of "log", "l": - var val = val - setLogLevel(val) - of "evaluate", "e": - s = val - of "help", "h": - echo usage - quit(0) - of "version", "v": - echo version - quit(0) - of "interactive", "i": - REPL = true - of "install": - INSTALL = true - libfile = val - of "uninstall": - UNINSTALL = true - libfile = val - else: - discard - else: - discard - - if s != "": - minString(s) - elif file != "": - minFile file - elif INSTALL: - if not libfile.existsFile: - fatal("Dynamic library file not found:" & libfile) - quit(4) - try: - libfile.copyFile(MINLIBS/libfile.extractFilename) - except: - fatal("Unable to install library file: " & libfile) - quit(5) - notice("Dynamic linbrary installed successfully: " & libfile.extractFilename) - quit(0) - elif UNINSTALL: - if not (MINLIBS/libfile.extractFilename).existsFile: - fatal("Dynamic library file not found:" & libfile) - quit(4) - try: - removeFile(MINLIBS/libfile.extractFilename) - except: - fatal("Unable to uninstall library file: " & libfile) - quit(6) - notice("Dynamic linbrary uninstalled successfully: " & libfile.extractFilename) - quit(0) - elif REPL: - minRepl() - quit(0) - else: - minFile stdin, "stdin" +when not defined(windows): + {.passL: "-rdynamic".} +import + streams, + critbits, + parseopt2, + strutils, + os, + ospaths, + json, + sequtils, + algorithm, + logging, + dynlib + +import + packages/nimline/nimline, + packages/niftylogger, + core/consts, + core/parser, + core/value, + core/scope, + core/interpreter, + core/utils +import + lib/min_lang, + lib/min_stack, + lib/min_seq, + lib/min_num, + lib/min_str, + lib/min_logic, + lib/min_time, + lib/min_io, + lib/min_sys, + lib/min_fs + +when not defined(lite): + import lib/min_crypto + import lib/min_math + +export + parser, + interpreter, + utils, + niftylogger, + value, + scope, + min_lang + +const PRELUDE* = "prelude.min".slurp.strip + +if logging.getHandlers().len == 0: + newNiftyLogger().addHandler() + +proc getExecs(): seq[string] = + var res = newSeq[string](0) + let getFiles = proc(dir: string) = + for c, s in walkDir(dir, true): + if (c == pcFile or c == pcLinkToFile) and not res.contains(s): + res.add s + getFiles(getCurrentDir()) + for dir in "PATH".getEnv.split(PathSep): + getFiles(dir) + res.sort(system.cmp) + return res + +proc getCompletions(ed: LineEditor, symbols: seq[string]): seq[string] = + var words = ed.lineText.split(" ") + var word: string + if words.len == 0: + word = ed.lineText + else: + word = words[words.len-1] + if word.startsWith("’"): + return symbols.mapIt("’" & $it) + elif word.startsWith("~"): + return symbols.mapIt("~" & $it) + if word.startsWith("@"): + return symbols.mapIt("@" & $it) + if word.startsWith("#"): + return symbols.mapIt("#" & $it) + if word.startsWith(">"): + return symbols.mapIt(">" & $it) + if word.startsWith("*"): + return symbols.mapIt("*" & $it) + if word.startsWith("("): + return symbols.mapIt("(" & $it) + if word.startsWith("<"): + return toSeq(MINSYMBOLS.readFile.parseJson.pairs).mapIt("<" & $it[0]) + if word.startsWith("$"): + return toSeq(envPairs()).mapIt("$" & $it[0]) + if word.startsWith("!"): + return getExecs().mapIt("!" & $it) + if word.startsWith("&"): + return getExecs().mapIt("&" & $it) + if word.startsWith("\""): + var f = word[1..^1] + if f == "": + f = getCurrentDir().replace("\\", "/") + return toSeq(walkDir(f, true)).mapIt("\"$1" % it.path.replace("\\", "/")) + elif f.dirExists: + f = f.replace("\\", "/") + if f[f.len-1] != '/': + f = f & "/" + return toSeq(walkDir(f, true)).mapIt("\"$1$2" % [f, it.path.replace("\\", "/")]) + else: + var dir: string + if f.contains("/") or dir.contains("\\"): + dir = f.parentDir + let file = f.extractFileName + return toSeq(walkDir(dir, true)).filterIt(it.path.toLowerAscii.startsWith(file.toLowerAscii)).mapIt("\"$1/$2" % [dir, it.path.replace("\\", "/")]) + else: + dir = getCurrentDir() + return toSeq(walkDir(dir, true)).filterIt(it.path.toLowerAscii.startsWith(f.toLowerAscii)).mapIt("\"$1" % [it.path.replace("\\", "/")]) + return symbols + +proc stdLib*(i: In) = + if not MINSYMBOLS.fileExists: + MINSYMBOLS.writeFile("{}") + if not MINHISTORY.fileExists: + MINHISTORY.writeFile("") + if not MINRC.fileExists: + MINRC.writeFile("") + i.lang_module + i.stack_module + i.seq_module + i.io_module + i.logic_module + i.num_module + i.str_module + i.sys_module + i.time_module + i.fs_module + when not defined(lite): + i.crypto_module + i.math_module + i.eval PRELUDE, "<prelude>" + i.eval MINRC.readFile() + i.eval "\"prompt\" unseal" + +type + LibProc = proc(i: In) {.nimcall.} + +proc dynLib*(i: In) = + discard MINLIBS.existsOrCreateDir + for library in walkFiles(MINLIBS & "/*"): + var modname = library.splitFile.name + var libfile = library.splitFile.name & library.splitFile.ext + if modname.len > 3 and modname[0..2] == "lib": + modname = modname[3..modname.len-1] + let dll = library.loadLib() + if dll != nil: + let modsym = dll.symAddr(modname) + if modsym != nil: + let modproc = cast[LibProc](dll.symAddr(modname)) + i.modproc() + info("[$1] Dynamic module loaded successfully: $2" % [libfile, modname]) + else: + warn("[$1] Library does not contain symbol $2" % [libfile, modname]) + else: + warn("Unable to load dynamic library: " & libfile) + +proc interpret*(i: In, s: Stream) = + i.stdLib() + i.dynLib() + i.open(s, i.filename) + discard i.parser.getToken() + try: + i.interpret() + except: + discard + i.close() + +proc minStream(s: Stream, filename: string) = + var i = newMinInterpreter(filename = filename) + i.pwd = filename.parentDir + i.interpret(s) + +proc minString*(buffer: string) = + minStream(newStringStream(buffer), "input") + +proc minFile*(filename: string) = + var fileLines = newSeq[string](0) + var contents = "" + try: + fileLines = filename.readFile().splitLines() + except: + fatal("Cannot read from file: "& filename) + quit(3) + + if fileLines[0].len >= 2 and fileLines[0][0..1] == "#!": + contents = fileLines[1..fileLines.len-1].join("\n") + else: + contents = fileLines.join("\n") + minStream(newStringStream(contents), filename) + +proc minFile*(file: File, filename="stdin") = + var stream = newFileStream(stdin) + if stream == nil: + fatal("Cannot read from file: "& filename) + quit(3) + minStream(stream, filename) + +proc printResult(i: In, res: MinValue) = + if res.isNil: + return + if i.stack.len > 0: + let n = $i.stack.len + if res.isQuotation and res.qVal.len > 1: + echo "{$1} -> (" % n + for item in res.qVal: + echo " " & $item + echo " ".repeat(n.len) & " )" + else: + echo "{$1} -> $2" % [$i.stack.len, $i.stack[i.stack.len - 1]] + +proc minRepl*(i: var MinInterpreter) = + i.stdLib() + i.dynLib() + var s = newStringStream("") + i.open(s, "<repl>") + var line: string + #echo "$1 v$2" % [appname, version] + var ed = initEditor(historyFile = MINHISTORY) + while true: + let symbols = toSeq(i.scope.symbols.keys) + ed.completionCallback = proc(ed: LineEditor): seq[string] = + return ed.getCompletions(symbols) + # evaluate prompt + i.push("prompt".newSym) + let vals = i.expect("string") + let v = vals[0] + let prompt = v.getString() + line = ed.readLine(prompt) + i.parser.bufpos = 0 + i.parser.buf = $line + i.parser.bufLen = i.parser.buf.len + discard i.parser.getToken() + try: + i.printResult i.interpret() + except: + discard + +proc minRepl*() = + var i = newMinInterpreter(filename = "<repl>") + i.minRepl + +when isMainModule: + + var REPL = false + var INSTALL = false + var UNINSTALL = false + var libfile = "" + + let usage* = """ $1 v$2 - a tiny concatenative shell and programming language + (c) 2014-2017 Fabio Cevasco + + Usage: + min [options] [filename] + + Arguments: + filename A $1 file to interpret (default: STDIN). + Options: + —install:<lib> Install dynamic library file <lib> + —uninstall:<lib> Uninstall dynamic library file <lib> + -e, —evaluate Evaluate a $1 program inline + -h, —help Print this help + -v, —version Print the program version + -i, —interactive Start $1 shell""" % [appname, version] + + var file, s: string = "" + setLogFilter(lvlNotice) + + for kind, key, val in getopt(): + case kind: + of cmdArgument: + file = key + of cmdLongOption, cmdShortOption: + case key: + of "log", "l": + var val = val + setLogLevel(val) + of "evaluate", "e": + s = val + of "help", "h": + echo usage + quit(0) + of "version", "v": + echo version + quit(0) + of "interactive", "i": + REPL = true + of "install": + INSTALL = true + libfile = val + of "uninstall": + UNINSTALL = true + libfile = val + else: + discard + else: + discard + + if s != "": + minString(s) + elif file != "": + minFile file + elif INSTALL: + if not libfile.existsFile: + fatal("Dynamic library file not found:" & libfile) + quit(4) + try: + libfile.copyFile(MINLIBS/libfile.extractFilename) + except: + fatal("Unable to install library file: " & libfile) + quit(5) + notice("Dynamic linbrary installed successfully: " & libfile.extractFilename) + quit(0) + elif UNINSTALL: + if not (MINLIBS/libfile.extractFilename).existsFile: + fatal("Dynamic library file not found:" & libfile) + quit(4) + try: + removeFile(MINLIBS/libfile.extractFilename) + except: + fatal("Unable to uninstall library file: " & libfile) + quit(6) + notice("Dynamic linbrary uninstalled successfully: " & libfile.extractFilename) + quit(0) + elif REPL: + minRepl() + quit(0) + else: + minFile stdin, "stdin"