From cc1709f30acdb4d7df6dec46c9dfc9f74794d216 Mon Sep 17 00:00:00 2001 From: Pekka Laiho Date: Tue, 8 Dec 2020 18:01:44 +0700 Subject: [PATCH] make more stuff available in safe-mode --- README.md | 10 +++++----- src/Evaller.php | 8 ++++---- src/Lib/Core.php | 14 ++++++-------- src/Printer.php | 4 ++-- 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index d5afc8f..0483517 100644 --- a/README.md +++ b/README.md @@ -263,15 +263,15 @@ case | yes | `(case (= 1 0) 0 (= 1 1) 1)` | `1` | Treat odd arguments as tests | yes | `(case (= 1 0) 0 "no match")` | `"no match"` | You can also give optional last argument to case which is returned if none of the tests evaluated to true. def | yes | `(def addOne (fn (a) (+ a 1)))` | `` | Define a value in the current environment. do | yes | `(do (print 1) 2)` | `12` | Evaluate multiple expressions and return the value of the last. -env | no | `(env +)` | `` | Return a definition from the current environment represented by argument. Without arguments return the current environment as a hash-map. -eval | no | `(eval (quote (+ 1 2)))` | `3` | Evaluate the argument. +env | yes | `(env +)` | `` | Return a definition from the current environment represented by argument. Without arguments return the current environment as a hash-map. +eval | yes | `(eval (quote (+ 1 2)))` | `3` | Evaluate the argument. fn | yes | `(fn (a b) (+ a b))` | `` | Create a function. Arguments can also be given as a vector instead of a list. if | yes | `(if (< 1 2) "yes" "no")` | `"yes"` | If the first argument evaluates to true, evaluate and return the second argument, otherwise the third argument. If the third argument is omitted return `null` in its place. let | yes | `(let (a (+ 1 2)) a)` | `3` | Create a new local environment using the first argument (list) to define values. Odd arguments are treated as keys and even arguments are treated as values. The last argument is the body of the let-expression which is evaluated using this new environment. load | no | `(load "file.mad")` | | Read and evaluate a file. The contents are implicitly wrapped in a `do` expression. macro | yes | | | See the section Macros. macroexpand | yes | | | See the section Macros. -meta | no | | | See the sections Environments and Reflection. +meta | yes | | | See the sections Environments and Reflection. or | yes | `(or false 0 1)` | `1` | Return the first value that evaluates to true, or the last value. quote | yes | | | See the section Quoting. quasiquote | yes | | | See the section Quoting. @@ -291,8 +291,8 @@ error | yes | `(error "invalid value")` | `error: invalid value` | Throw an exce exit | no | `(exit 1)` | | Terminate the script with given exit code using [exit](https://www.php.net/manual/en/function.exit.php). loop | yes | `(loop (fn (a) (do (print a) (coinflip))) "hello ")` | `hello hello hello false` | Call the given function repeatedly in a loop until it returns false. print | no | `(print "hello world")` | `hello world` | Print expression on the screen. Give optional second argument as `true` to show strings in readable format. Print returns null (shown in REPL). -pstr | yes | `(pstr {"a":"b"} true)` | `"{\"a\":\"b\"}"` | Print expression to string. Give optional second argument as `true` to show strings in readable format. -read | no | `(read "(+ 1 2 3)")` | `(+ 1 2 3)` | Read a string as code and return the expression. +pstr | yes | `(pstr {"a":"b"})` | `"{\"a\":\"b\"}"` | Print expression to string. +read | yes | `(read "(+ 1 2 3)")` | `(+ 1 2 3)` | Read a string as code and return the expression. sleep | no | `(sleep 2000)` | `null` | Sleep for the given period given in milliseconds using [usleep](https://www.php.net/manual/en/function.usleep). timer | no | `(timer (fn (d) (sleep d)) 200)` | `0.20010209` | Measure the execution time of a function and return it in seconds. diff --git a/src/Evaller.php b/src/Evaller.php index cacc8c5..bc3cf65 100644 --- a/src/Evaller.php +++ b/src/Evaller.php @@ -31,7 +31,7 @@ class Evaller // Show debug output if ($this->debug) { printf("%s %2d : ", $isTco ? ' tco' : 'eval', $depth); - $this->printer->print($ast); + $this->printer->print($ast, true); print("\n"); $isTco = true; } @@ -150,7 +150,7 @@ class Evaller $ast = $astData[$astLength - 1]; continue; // tco - } elseif (!$this->safemode && $symbolName == 'env') { + } elseif ($symbolName == 'env') { if ($astLength >= 2) { if (!($astData[1] instanceof Symbol)) { throw new MadLispException("first argument to env is not symbol"); @@ -160,7 +160,7 @@ class Evaller } else { return $env; } - } elseif (!$this->safemode && $symbolName == 'eval') { + } elseif ($symbolName == 'eval') { if ($astLength == 1) { return null; } @@ -295,7 +295,7 @@ class Evaller } return $this->macroexpand($astData[1], $env); - } elseif (!$this->safemode && $symbolName == 'meta') { + } elseif ($symbolName == 'meta') { if ($astLength != 3) { throw new MadLispException("meta requires exactly 2 arguments"); } elseif (!is_string($astData[2])) { diff --git a/src/Lib/Core.php b/src/Lib/Core.php index 89b0f4b..71372e2 100644 --- a/src/Lib/Core.php +++ b/src/Lib/Core.php @@ -94,17 +94,15 @@ class Core implements ILib )); } - $env->set('pstr', new CoreFunc('pstr', 'Print argument to string. Give second argument as true to show strings in readable format.', 1, 2, - function ($a, bool $readable = false) { - return $this->printer->pstr($a, $readable); + $env->set('pstr', new CoreFunc('pstr', 'Print argument to string.', 1, 1, + function ($a) { + return $this->printer->pstr($a, true); } )); - if (!$this->safemode) { - $env->set('read', new CoreFunc('read', 'Read string as code.', 1, 1, - fn (string $a) => $this->reader->read($this->tokenizer->tokenize($a)) - )); - } + $env->set('read', new CoreFunc('read', 'Read string as code.', 1, 1, + fn (string $a) => $this->reader->read($this->tokenizer->tokenize($a)) + )); if (!$this->safemode) { $env->set('sleep', new CoreFunc('sleep', 'Sleep (wait) for the specified time in milliseconds.', 1, 1, diff --git a/src/Printer.php b/src/Printer.php index 15d1d20..24e024d 100644 --- a/src/Printer.php +++ b/src/Printer.php @@ -3,12 +3,12 @@ namespace MadLisp; class Printer { - public function print($ast, bool $readable = true): void + public function print($ast, bool $readable): void { print($this->pstr($ast, $readable)); } - public function pstr($ast, bool $readable = true): string + public function pstr($ast, bool $readable): string { return $this->doPrint($ast, $readable); }