mirrors/madlisp
1
0
Fork 0
mirror of https://github.com/peklaiho/madlisp.git synced 2024-11-25 14:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

do not print out result by default, only with the -p option

Browse Source
This commit is contained in:
Pekka Laiho 2021-06-01 07:42:45 +07:00
parent 4475fc7cf4
commit 1be4e17711
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bin/madlisp
View File

@ -28,6 +28,7 @@ function ml_help()
print("-d :: Enable debug mode" . PHP_EOL); print("-d :: Enable debug mode" . PHP_EOL);
print("-e <code> :: Evaluate code" . PHP_EOL); print("-e <code> :: Evaluate code" . PHP_EOL);
print("-h :: Show this help" . PHP_EOL); print("-h :: Show this help" . PHP_EOL);
print("-p :: Print out result" . PHP_EOL);
print("-q :: Skip the init file" . PHP_EOL); print("-q :: Skip the init file" . PHP_EOL);
print("-r :: Run the interactive REPL" . PHP_EOL); print("-r :: Run the interactive REPL" . PHP_EOL);
print("<file> :: Evaluate file" . PHP_EOL); print("<file> :: Evaluate file" . PHP_EOL);
@ -98,6 +99,7 @@ $loadInit = true;
$runRepl = false; $runRepl = false;
$filename = null; $filename = null;
$lastArg = null; $lastArg = null;
$printResult = false;
// Arguments after -- are passed to the script // Arguments after -- are passed to the script
$dividerFound = false; $dividerFound = false;
@ -116,6 +118,8 @@ for ($i = 1; $i < $argc; $i++) {
} elseif ($a == '-h' || $a == '--help') { } elseif ($a == '-h' || $a == '--help') {
ml_help(); // exit ml_help(); // exit
} elseif ($a == '-p') {
$printResult = true;
} elseif ($a == '-q') { } elseif ($a == '-q') {
$loadInit = false; $loadInit = false;
} elseif ($a == '-r') { } elseif ($a == '-r') {
@ -154,13 +158,19 @@ if ($debugMode) {
// Eval code passed via -e // Eval code passed via -e
if ($evalCode) { if ($evalCode) {
$lisp->rep($evalCode, false); $result = $lisp->readEval($evalCode);
if ($printResult) {
$lisp->print($result, false);
}
} }
// Eval file // Eval file
if ($filename) { if ($filename) {
if (is_readable($filename)) { if (is_readable($filename)) {
$lisp->rep("(load \"$filename\")", false); $result = $lisp->readEval("(load \"$filename\")");
if ($printResult) {
$lisp->print($result, false);
}
} else { } else {
print("Unable to read file: $filename" . PHP_EOL); print("Unable to read file: $filename" . PHP_EOL);
exit(1); exit(1);
@ -175,5 +185,8 @@ if ($runRepl) {
// Finally, if we had no other actions, read input from stdin // Finally, if we had no other actions, read input from stdin
if (!$evalCode && !$filename) { if (!$evalCode && !$filename) {
$input = file_get_contents('php://stdin'); $input = file_get_contents('php://stdin');
$lisp->rep($input, false); $result = $lisp->readEval($input);
if ($printResult) {
$lisp->print($result, false);
}
} }