on master help sign in
Merge branch 'master' into julia
commitecc2d2f7ba3754a537429bf305517149a8cb337b authorMason Clayton <mason@turb.io> dateMon 25 Feb 2019, 12:00 (8 years ago) parent9419fbf742f732
17 files changed+368−470
.travis.yml+1 Dockerfile+2−3 README.md+26−22 languages/lua/lua.c+127−379 languages/lua/main.go+23−16 languages/lua/pry.c+4−34 languages/lua/pry.h+8−11 languages/python2/main.go+3−3 languages/python3/main.go+2−2 test_files/hello.lua+2 tests/lua/always_try_expression.exp+26 tests/lua/history.exp+30 tests/lua/load_file.exp+14 tests/lua/own_eval.exp+51 tests/lua/ps1_ps2.exp+18 tests/lua/quiet.exp+12 tests/lua/returns.exp+19
.travis.yml+1
@@ -5,3 +5,4 @@ services:
55
66script:
77 - docker build -t prybar .
8+ - docker run -t prybar make test
Dockerfile+2−3
@@ -6,7 +6,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
66 golang \
77 python-dev \
88 python3-dev \
9− liblua5.2-dev \
9+ liblua5.1-dev \
10+ libreadline-dev \
1011 ruby2.5-dev \
1112 tcl-dev \
1213 libnspr4-dev \
@@ -37,8 +38,6 @@ WORKDIR /gocode/src/github.com/replit/prybar
3738
3839RUN which node
3940
40−RUN make prybar-julia
41−
4241RUN make \
4342 prybar-python2 \
4443 prybar-python3 \
README.md+26−22
@@ -29,14 +29,18 @@ Usage of ./prybar-language:
2929 -q quiet
3030```
3131
32−## Supported Languages
33−* Python 2.7
34−* Python 3.x
35−* Ruby 2.5
36−* Lua 5.2
37−* TCL
38−* R
39−* Spidermonkey (javascript)
32+## Language Support
33+
34+| language | eval | eval expression | eval file | repl | repl like eval | set prompt |
35+| ------------------------- | ---- | --------------- | --------- | ---- | -------------- | ---------- |
36+| Python 2.7 | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
37+| Python 3.x | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
38+| Ruby 2.5 | ✔ | ✔ | ✔ | ✔ | ✗ | ✗ |
39+| Lua 5.2 | ✔ | ✗ | ✔ | ✔ | ✗ | ✗ |
40+| Tcl | ✔ | ✔ | ✗ | ✗ | ✗ | ✗ |
41+| R | ✔ | ✗ | ✗ | ✔ | ✗ | ✗ |
42+| Javascript (spidermonkey) | ✔ | ✗ | ✗ | ✗ | ✗ | ✗ |
43+| Javascript (nodejs) | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
4044
4145## Building
4246
@@ -58,21 +62,21 @@ The script `./extract.sh` can be used to compile and produce a tarball containin
5862
5963## License
6064
61− Copyright (C) 2004-2018 Neoreason, Inc. et al.
65+Copyright (C) 2004-2018 Neoreason, Inc. et al.
6266
63− This program is free software; you can redistribute it and/or
64− modify it under the terms of the GNU General Public License
65− as published by the Free Software Foundation; either version 2
66− of the License, or (at your option) any later version.
67+This program is free software; you can redistribute it and/or
68+modify it under the terms of the GNU General Public License
69+as published by the Free Software Foundation; either version 2
70+of the License, or (at your option) any later version.
6771
68− This program is distributed in the hope that it will be useful,
69− but WITHOUT ANY WARRANTY; without even the implied warranty of
70− MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
71− GNU General Public License for more details.
72+This program is distributed in the hope that it will be useful,
73+but WITHOUT ANY WARRANTY; without even the implied warranty of
74+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
75+GNU General Public License for more details.
7276
73− You should have received a copy of the GNU General Public License
74− along with this program; if not, write to the Free Software
75− Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
77+You should have received a copy of the GNU General Public License
78+along with this program; if not, write to the Free Software
79+Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
7680
77− See the COPYING file for more information regarding the GNU General
78− Public License.
81+See the COPYING file for more information regarding the GNU General
82+Public License.
languages/lua/lua.c+127−379
@@ -1,497 +1,245 @@
1+// Copied straight from https://www.lua.org/source/5.1/lua.c.html
2+// with some of the cli stuff stripped out.
3+
14/*
2−** $Id: lua.c,v 1.206.1.1 2013/04/12 18:48:47 roberto Exp $
5+** $Id: lua.c,v 1.160.1.2 2007/12/28 15:32:23 roberto Exp $
36** Lua stand-alone interpreter
47** See Copyright Notice in lua.h
58*/
69
7−#include "pry.h"
810#include <signal.h>
911#include <stdio.h>
1012#include <stdlib.h>
1113#include <string.h>
1214
1315#define lua_c
16+#define LUA_USE_LINUX
1417
15−#include "lua.h"
16−
17−#include "lauxlib.h"
18−#include "lualib.h"
19−
20−
21−#if !defined(LUA_PROMPT)
22−#define LUA_PROMPT "> "
23−#define LUA_PROMPT2 ">> "
24−#endif
25−
26−#if !defined(LUA_PROGNAME)
27−#define LUA_PROGNAME "lua"
28−#endif
29−
30−#if !defined(LUA_MAXINPUT)
31−#define LUA_MAXINPUT 512
32−#endif
33−
34−#if !defined(LUA_INIT)
35−#define LUA_INIT "LUA_INIT"
36−#endif
37−
38−#define LUA_INITVERSION \
39− LUA_INIT "_" LUA_VERSION_MAJOR "_" LUA_VERSION_MINOR
40−
41−
42−/*
43−** lua_stdin_is_tty detects whether the standard input is a 'tty' (that
44−** is, whether we're running lua interactively).
45−*/
46−#if defined(LUA_USE_ISATTY)
47−#include <unistd.h>
48−#define lua_stdin_is_tty() isatty(0)
49−#elif defined(LUA_WIN)
50−#include <io.h>
51−#include <stdio.h>
52−#define lua_stdin_is_tty() _isatty(_fileno(stdin))
53−#else
54−#define lua_stdin_is_tty() 1 /* assume stdin is a tty */
55−#endif
56−
18+#include <lua.h>
5719
58−/*
59−** lua_readline defines how to show a prompt and then read a line from
60−** the standard input.
61−** lua_saveline defines how to "save" a read line in a "history".
62−** lua_freeline defines how to free a line read by lua_readline.
63−*/
64−#if defined(LUA_USE_READLINE)
65−
66−#include <stdio.h>
67−#include <readline/readline.h>
68−#include <readline/history.h>
69−#define lua_readline(L,b,p) ((void)L, ((b)=readline(p)) != NULL)
70−#define lua_saveline(L,idx) \
71− if (lua_rawlen(L,idx) > 0) /* non-empty line? */ \
72− add_history(lua_tostring(L, idx)); /* add it to history */
73−#define lua_freeline(L,b) ((void)L, free(b))
74−
75−#elif !defined(lua_readline)
76−
77−#define lua_readline(L,b,p) \
78− ((void)L, fputs(p, stdout), fflush(stdout), /* show prompt */ \
79− fgets(b, LUA_MAXINPUT, stdin) != NULL) /* get line */
80−#define lua_saveline(L,idx) { (void)L; (void)idx; }
81−#define lua_freeline(L,b) { (void)L; (void)b; }
82−
83−#endif
20+#include <lauxlib.h>
21+#include <luaconf.h>
22+#include <lualib.h>
8423
85−
86−
87−
88−static lua_State *globalL = NULL;
24+extern lua_State *pry_L;
8925
9026static const char *progname = LUA_PROGNAME;
9127
92−
93−
94−static void lstop (lua_State *L, lua_Debug *ar) {
95− (void)ar; /* unused arg. */
28+static void lstop(lua_State *L, lua_Debug *ar) {
29+ (void)ar; /* unused arg. */
9630 lua_sethook(L, NULL, 0, 0);
9731 luaL_error(L, "interrupted!");
9832}
9933
100−
101−static void laction (int i) {
34+static void laction(int i) {
10235 signal(i, SIG_DFL); /* if another SIGINT happens before lstop,
10336 terminate process (default action) */
104− lua_sethook(globalL, lstop, LUA_MASKCALL | LUA_MASKRET | LUA_MASKCOUNT, 1);
37+ lua_sethook(pry_L, lstop, LUA_MASKCALL | LUA_MASKRET | LUA_MASKCOUNT, 1);
10538}
10639
107−
108−static void print_usage (const char *badoption) {
109− luai_writestringerror("%s: ", progname);
110− if (badoption[1] == 'e' || badoption[1] == 'l')
111− luai_writestringerror("'%s' needs argument\n", badoption);
112− else
113− luai_writestringerror("unrecognized option '%s'\n", badoption);
114− luai_writestringerror(
115− "usage: %s [options] [script [args]]\n"
116− "Available options are:\n"
117− " -e stat execute string " LUA_QL("stat") "\n"
118− " -i enter interactive mode after executing " LUA_QL("script") "\n"
119− " -l name require library " LUA_QL("name") "\n"
120− " -v show version information\n"
121− " -E ignore environment variables\n"
122− " -- stop handling options\n"
123− " - stop handling options and execute stdin\n"
124− ,
125− progname);
126−}
127−
128−
129−static void l_message (const char *pname, const char *msg) {
130− if (pname) luai_writestringerror("%s: ", pname);
131− luai_writestringerror("%s\n", msg);
40+static void l_message(const char *pname, const char *msg) {
41+ if (pname)
42+ fprintf(stderr, "%s: ", pname);
43+ fprintf(stderr, "%s\n", msg);
44+ fflush(stderr);
13245}
13346
134−
135−static int report (lua_State *L, int status) {
136− if (status != LUA_OK && !lua_isnil(L, -1)) {
47+static int report(lua_State *L, int status) {
48+ if (status && !lua_isnil(L, -1)) {
13749 const char *msg = lua_tostring(L, -1);
138− if (msg == NULL) msg = "(error object is not a string)";
50+ if (msg == NULL)
51+ msg = "(error object is not a string)";
13952 l_message(progname, msg);
14053 lua_pop(L, 1);
141− /* force a complete garbage collection in case of errors */
142− lua_gc(L, LUA_GCCOLLECT, 0);
14354 }
14455 return status;
14556}
14657
147−
148−/* the next function is called unprotected, so it must avoid errors */
149−void finalreport (lua_State *L, int status) {
150− if (status != LUA_OK) {
151− const char *msg = (lua_type(L, -1) == LUA_TSTRING) ? lua_tostring(L, -1)
152− : NULL;
153− if (msg == NULL) msg = "(error object is not a string)";
154− l_message(progname, msg);
58+static int traceback(lua_State *L) {
59+ if (!lua_isstring(L, 1)) /* 'message' not a string? */
60+ return 1; /* keep it intact */
61+ lua_getfield(L, LUA_GLOBALSINDEX, "debug");
62+ if (!lua_istable(L, -1)) {
15563 lua_pop(L, 1);
64+ return 1;
15665 }
157−}
158−
159−
160−static int traceback (lua_State *L) {
161− const char *msg = lua_tostring(L, 1);
162− if (msg)
163− luaL_traceback(L, L, msg, 1);
164− else if (!lua_isnoneornil(L, 1)) { /* is there an error object? */
165− if (!luaL_callmeta(L, 1, "__tostring")) /* try its 'tostring' metamethod */
166− lua_pushliteral(L, "(no error message)");
66+ lua_getfield(L, -1, "traceback");
67+ if (!lua_isfunction(L, -1)) {
68+ lua_pop(L, 2);
69+ return 1;
16770 }
71+ lua_pushvalue(L, 1); /* pass error message */
72+ lua_pushinteger(L, 2); /* skip this function and traceback */
73+ lua_call(L, 2, 1); /* call debug.traceback */
16874 return 1;
16975}
17076
171−
172−static int docall (lua_State *L, int narg, int nres) {
77+static int docall(lua_State *L, int narg, int clear) {
17378 int status;
174− int base = lua_gettop(L) - narg; /* function index */
175− lua_pushcfunction(L, traceback); /* push traceback function */
176− lua_insert(L, base); /* put it under chunk and args */
177− globalL = L; /* to be available to 'laction' */
79+ int base = lua_gettop(L) - narg; /* function index */
80+ lua_pushcfunction(L, traceback); /* push traceback function */
81+ lua_insert(L, base); /* put it under chunk and args */
17882 signal(SIGINT, laction);
179− status = lua_pcall(L, narg, nres, base);
83+ status = lua_pcall(L, narg, (clear ? 0 : LUA_MULTRET), base);
18084 signal(SIGINT, SIG_DFL);
181− lua_remove(L, base); /* remove traceback function */
85+ lua_remove(L, base); /* remove traceback function */
86+ /* force a complete garbage collection in case of errors */
87+ if (status != 0)
88+ lua_gc(L, LUA_GCCOLLECT, 0);
18289 return status;
18390}
18491
185−
186−static void print_version (void) {
187− luai_writestring(LUA_COPYRIGHT, strlen(LUA_COPYRIGHT));
188− luai_writeline();
92+static void print_version(void) {
93+ l_message(NULL, LUA_RELEASE " " LUA_COPYRIGHT);
18994}
19095
191−
192−static int getargs (lua_State *L, char **argv, int n) {
96+static int getargs(lua_State *L, char **argv, int n) {
19397 int narg;
19498 int i;
19599 int argc = 0;
196− while (argv[argc]) argc++; /* count total number of arguments */
197− narg = argc - (n + 1); /* number of arguments to the script */
100+ while (argv[argc])
101+ argc++; /* count total number of arguments */
102+ narg = argc - (n + 1); /* number of arguments to the script */
198103 luaL_checkstack(L, narg + 3, "too many arguments to script");
199− for (i=n+1; i < argc; i++)
104+ for (i = n + 1; i < argc; i++)
200105 lua_pushstring(L, argv[i]);
201106 lua_createtable(L, narg, n + 1);
202− for (i=0; i < argc; i++) {
107+ for (i = 0; i < argc; i++) {
203108 lua_pushstring(L, argv[i]);
204109 lua_rawseti(L, -2, i - n);
205110 }
206111 return narg;
207112}
208113
209−
210−static int dofile (lua_State *L, const char *name) {
211− int status = luaL_loadfile(L, name);
212− if (status == LUA_OK) status = docall(L, 0, 0);
114+int dostring(lua_State *L, const char *s, const char *name) {
115+ int status = luaL_loadbuffer(L, s, strlen(s), name) || docall(L, 0, 1);
213116 return report(L, status);
214117}
215118
216−
217−static int dostring (lua_State *L, const char *s, const char *name) {
218− int status = luaL_loadbuffer(L, s, strlen(s), name);
219− if (status == LUA_OK) status = docall(L, 0, 0);
220− return report(L, status);
221−}
222−
223−
224−static int dolibrary (lua_State *L, const char *name) {
225− int status;
226− lua_getglobal(L, "require");
227− lua_pushstring(L, name);
228− status = docall(L, 1, 1); /* call 'require(name)' */
229− if (status == LUA_OK)
230− lua_setglobal(L, name); /* global[name] = require return */
231− return report(L, status);
232−}
233−
234−
235−static const char *get_prompt (lua_State *L, int firstline) {
119+static const char *get_prompt(lua_State *L, int firstline) {
236120 const char *p;
237− lua_getglobal(L, firstline ? "_PROMPT" : "_PROMPT2");
121+ lua_getfield(L, LUA_GLOBALSINDEX, firstline ? "_PROMPT" : "_PROMPT2");
238122 p = lua_tostring(L, -1);
239− if (p == NULL) p = (firstline ? LUA_PROMPT : LUA_PROMPT2);
123+ if (p == NULL)
124+ p = (firstline ? LUA_PROMPT : LUA_PROMPT2);
125+ lua_pop(L, 1); /* remove global */
240126 return p;
241127}
242128
243−/* mark in error messages for incomplete statements */
244−#define EOFMARK "<eof>"
245−#define marklen (sizeof(EOFMARK)/sizeof(char) - 1)
246−
247−static int incomplete (lua_State *L, int status) {
129+static int incomplete(lua_State *L, int status) {
248130 if (status == LUA_ERRSYNTAX) {
249131 size_t lmsg;
250132 const char *msg = lua_tolstring(L, -1, &lmsg);
251− if (lmsg >= marklen && strcmp(msg + lmsg - marklen, EOFMARK) == 0) {
133+ const char *tp = msg + lmsg - (sizeof(LUA_QL("<eof>")) - 1);
134+ if (strstr(msg, LUA_QL("<eof>")) == tp) {
252135 lua_pop(L, 1);
253136 return 1;
254137 }
255138 }
256− return 0; /* else... */
257−}
258139
140+ return 0; /* else... */
141+}
259142
260−static int pushline (lua_State *L, int firstline) {
143+static int pushline(lua_State *L, int firstline) {
261144 char buffer[LUA_MAXINPUT];
262145 char *b = buffer;
263146 size_t l;
264147 const char *prmt = get_prompt(L, firstline);
265− int readstatus = lua_readline(L, b, prmt);
266− lua_pop(L, 1); /* remove result from 'get_prompt' */
267− if (readstatus == 0)
268− return 0; /* no input */
148+ if (lua_readline(L, b, prmt) == 0)
149+ return 0; /* no input */
269150 l = strlen(b);
270− if (l > 0 && b[l-1] == '\n') /* line ends with newline? */
271− b[l-1] = '\0'; /* remove it */
272− if (firstline && b[0] == '=') /* first line starts with `=' ? */
273− lua_pushfstring(L, "return %s", b+1); /* change it to `return' */
151+ if (l > 0 && b[l - 1] == '\n') /* line ends with newline? */
152+ b[l - 1] = '\0'; /* remove it */
153+ if (firstline && b[0] == '=') /* first line starts with `=' ? */
154+ lua_pushfstring(L, "return %s", b + 1); /* change it to `return' */
274155 else
275156 lua_pushstring(L, b);
276157 lua_freeline(L, b);
277158 return 1;
278159}
279160
161+static int try_expression(lua_State *L) {
162+ lua_pushliteral(L, "return ");
163+ lua_pushvalue(L, 1);
164+ lua_concat(L, 2);
280165
281−static int loadline (lua_State *L) {
282− int status;
166+ int rstatus =
167+ luaL_loadbuffer(L, lua_tostring(L, -1), lua_strlen(L, -1), "=stdin");
168+
169+ if (rstatus) {
170+ lua_pop(L, 2);
171+ return 1;
172+ }
173+
174+ lua_remove(L, 2);
175+
176+ return 0;
177+}
178+
179+static int loadline(lua_State *L) {
180+ int status = 0;
283181 lua_settop(L, 0);
284182 if (!pushline(L, 1))
285− return -1; /* no input */
286− for (;;) { /* repeat until gets a complete line */
287− size_t l;
288− const char *line = lua_tolstring(L, 1, &l);
289− status = luaL_loadbuffer(L, line, l, "=stdin");
290− if (!incomplete(L, status)) break; /* cannot try to add lines? */
291− if (!pushline(L, 0)) /* no more input? */
183+ return -1; /* no input */
184+
185+ for (;;) { /* repeat until gets a complete line */
186+ status = try_expression(L);
187+ if (!status)
188+ break;
189+
190+ status = luaL_loadbuffer(L, lua_tostring(L, 1), lua_strlen(L, 1), "=stdin");
191+
192+ if (!incomplete(L, status))
193+ break; /* cannot try to add lines? */
194+
195+ if (!pushline(L, 0)) /* no more input? */
292196 return -1;
293− lua_pushliteral(L, "\n"); /* add a new line... */
294− lua_insert(L, -2); /* ...between the two lines */
295− lua_concat(L, 3); /* join them */
197+ lua_pushliteral(L, "\n"); /* add a new line... */
198+ lua_insert(L, -2); /* ...between the two lines */
199+ lua_concat(L, 3); /* join them */
296200 }
201+
297202 lua_saveline(L, 1);
298− lua_remove(L, 1); /* remove line */
203+ lua_remove(L, 1); /* remove line */
299204 return status;
300205}
301206
302−
303−void dotty (lua_State *L) {
207+void dotty(lua_State *L) {
304208 int status;
305209 const char *oldprogname = progname;
306210 progname = NULL;
307211 while ((status = loadline(L)) != -1) {
308− if (status == LUA_OK) status = docall(L, 0, LUA_MULTRET);
212+ if (status == 0)
213+ status = docall(L, 0, 0);
309214 report(L, status);
310− if (status == LUA_OK && lua_gettop(L) > 0) { /* any result to print? */
311− luaL_checkstack(L, LUA_MINSTACK, "too many results to print");
215+ if (status == 0 && lua_gettop(L) > 0) { /* any result to print? */
312216 lua_getglobal(L, "print");
313217 lua_insert(L, 1);
314− if (lua_pcall(L, lua_gettop(L)-1, 0, 0) != LUA_OK)
315− l_message(progname, lua_pushfstring(L,
316− "error calling " LUA_QL("print") " (%s)",
317− lua_tostring(L, -1)));
218+ if (lua_pcall(L, lua_gettop(L) - 1, 0, 0) != 0)
219+ l_message(progname,
220+ lua_pushfstring(L, "error calling " LUA_QL("print") " (%s)",
221+ lua_tostring(L, -1)));
318222 }
319223 }
320− lua_settop(L, 0); /* clear stack */
321− luai_writeline();
224+ lua_settop(L, 0); /* clear stack */
225+ fputs("\n", stdout);
226+ fflush(stdout);
322227 progname = oldprogname;
323228}
324229
325−
326−int handle_script (lua_State *L, char **argv, int n) {
230+int handle_script(lua_State *L, char **argv, int n) {
327231 int status;
328232 const char *fname;
329− int narg = getargs(L, argv, n); /* collect arguments */
233+ int narg = getargs(L, argv, n); /* collect arguments */
330234 lua_setglobal(L, "arg");
331235 fname = argv[n];
332− if (strcmp(fname, "-") == 0 && strcmp(argv[n-1], "--") != 0)
333− fname = NULL; /* stdin */
236+ if (strcmp(fname, "-") == 0 && strcmp(argv[n - 1], "--") != 0)
237+ fname = NULL; /* stdin */
334238 status = luaL_loadfile(L, fname);
335− lua_insert(L, -(narg+1));
336− if (status == LUA_OK)
337− status = docall(L, narg, LUA_MULTRET);
239+ lua_insert(L, -(narg + 1));
240+ if (status == 0)
241+ status = docall(L, narg, 0);
338242 else
339243 lua_pop(L, narg);
340244 return report(L, status);
341245}
342−
343−
344−/* check that argument has no extra characters at the end */
345−#define noextrachars(x) {if ((x)[2] != '\0') return -1;}
346−
347−
348−/* indices of various argument indicators in array args */
349−#define has_i 0 /* -i */
350−#define has_v 1 /* -v */
351−#define has_e 2 /* -e */
352−#define has_E 3 /* -E */
353−
354−#define num_has 4 /* number of 'has_*' */
355−
356−
357−static int collectargs (char **argv, int *args) {
358− int i;
359− for (i = 1; argv[i] != NULL; i++) {
360− if (argv[i][0] != '-') /* not an option? */
361− return i;
362− switch (argv[i][1]) { /* option */
363− case '-':
364− noextrachars(argv[i]);
365− return (argv[i+1] != NULL ? i+1 : 0);
366− case '\0':
367− return i;
368− case 'E':
369− args[has_E] = 1;
370− break;
371− case 'i':
372− noextrachars(argv[i]);
373− args[has_i] = 1; /* go through */
374− case 'v':
375− noextrachars(argv[i]);
376− args[has_v] = 1;
377− break;
378− case 'e':
379− args[has_e] = 1; /* go through */
380− case 'l': /* both options need an argument */
381− if (argv[i][2] == '\0') { /* no concatenated argument? */
382− i++; /* try next 'argv' */
383− if (argv[i] == NULL || argv[i][0] == '-')
384− return -(i - 1); /* no next argument or it is another option */
385− }
386− break;
387− default: /* invalid option; return its index... */
388− return -i; /* ...as a negative value */
389− }
390− }
391− return 0;
392−}
393−
394−
395−static int runargs (lua_State *L, char **argv, int n) {
396− int i;
397− for (i = 1; i < n; i++) {
398− lua_assert(argv[i][0] == '-');
399− switch (argv[i][1]) { /* option */
400− case 'e': {
401− const char *chunk = argv[i] + 2;
402− if (*chunk == '\0') chunk = argv[++i];
403− lua_assert(chunk != NULL);
404− if (dostring(L, chunk, "=(command line)") != LUA_OK)
405− return 0;
406− break;
407− }
408− case 'l': {
409− const char *filename = argv[i] + 2;
410− if (*filename == '\0') filename = argv[++i];
411− lua_assert(filename != NULL);
412− if (dolibrary(L, filename) != LUA_OK)
413− return 0; /* stop if file fails */
414− break;
415− }
416− default: break;
417− }
418− }
419− return 1;
420−}
421−
422−
423−static int handle_luainit (lua_State *L) {
424− const char *name = "=" LUA_INITVERSION;
425− const char *init = getenv(name + 1);
426− if (init == NULL) {
427− name = "=" LUA_INIT;
428− init = getenv(name + 1); /* try alternative name */
429− }
430− if (init == NULL) return LUA_OK;
431− else if (init[0] == '@')
432− return dofile(L, init+1);
433− else
434− return dostring(L, init, name);
435−}
436−
437−
438−int pmain (lua_State *L) {
439− int argc = (int)lua_tointeger(L, 1);
440− char **argv = (char **)lua_touserdata(L, 2);
441− int script;
442− int args[num_has];
443− args[has_i] = args[has_v] = args[has_e] = args[has_E] = 0;
444− if (argv[0] && argv[0][0]) progname = argv[0];
445− script = collectargs(argv, args);
446− if (script < 0) { /* invalid arg? */
447− print_usage(argv[-script]);
448− return 0;
449− }
450− if (args[has_v]) print_version();
451− if (args[has_E]) { /* option '-E'? */
452− lua_pushboolean(L, 1); /* signal for libraries to ignore env. vars. */
453− lua_setfield(L, LUA_REGISTRYINDEX, "LUA_NOENV");
454− }
455− /* open standard libraries */
456− luaL_checkversion(L);
457− lua_gc(L, LUA_GCSTOP, 0); /* stop collector during initialization */
458− luaL_openlibs(L); /* open libraries */
459− lua_gc(L, LUA_GCRESTART, 0);
460− if (!args[has_E] && handle_luainit(L) != LUA_OK)
461− return 0; /* error running LUA_INIT */
462− /* execute arguments -e and -l */
463− if (!runargs(L, argv, (script > 0) ? script : argc)) return 0;
464− /* execute main script (if there is one) */
465− if (script && handle_script(L, argv, script) != LUA_OK) return 0;
466− if (args[has_i]) /* -i option? */
467− dotty(L);
468− else if (script == 0 && !args[has_e] && !args[has_v]) { /* no arguments? */
469− if (lua_stdin_is_tty()) {
470− print_version();
471− dotty(L);
472− }
473− else dofile(L, NULL); /* executes stdin as a file */
474− }
475− lua_pushboolean(L, 1); /* signal no errors */
476− return 1;
477−}
478−
479−
480−int lua_main (int argc, char **argv) {
481− int status, result;
482− lua_State *L = luaL_newstate(); /* create state */
483− if (L == NULL) {
484− l_message(argv[0], "cannot create state: not enough memory");
485− return EXIT_FAILURE;
486− }
487− /* call 'pmain' in protected mode */
488− lua_pushcfunction(L, &pmain);
489− lua_pushinteger(L, argc); /* 1st argument */
490− lua_pushlightuserdata(L, argv); /* 2nd argument */
491− status = lua_pcall(L, 2, 1, 0);
492− result = lua_toboolean(L, -1); /* get result */
493− finalreport(L, status);
494− lua_close(L);
495− return (result && status == LUA_OK) ? EXIT_SUCCESS : EXIT_FAILURE;
496−}
497−
languages/lua/main.go+23−16
@@ -3,54 +3,61 @@ package main
33// USING_CGO
44
55/*
6−#cgo pkg-config: lua-5.2
6+#cgo pkg-config: lua-5.1
7+#cgo LDFLAGS: -lreadline
78#include <stdlib.h>
89#include <lua.h>
10+#include <lauxlib.h>
11+#include <lualib.h>
912#include "pry.h"
1013
11−int lua_main (int argc, char **argv);
12−void dotty (lua_State *L);
13−int pmain (lua_State *L);
14−
15−
16−
1714*/
1815import "C"
1916
2017import (
21− "strings"
2218 "unsafe"
2319)
2420
2521type Lua struct{}
2622
2723func (p Lua) Open() {
28− C.pry_init()
24+ C.pry_L = C.luaL_newstate()
25+ C.luaL_openlibs(C.pry_L)
2926}
3027
3128func (p Lua) Version() string {
3229 return C.GoString(C.pry_get_version())
3330}
3431
32+func (p Lua) SetPrompts(ps1, ps2 string) {
33+ c1 := C.CString(ps1)
34+ C.lua_pushstring(C.pry_L, c1)
35+ C.free(unsafe.Pointer(c1))
36+
37+ C.lua_setfield(C.pry_L, C.LUA_GLOBALSINDEX, C.CString("_PROMPT"))
38+
39+ c2 := C.CString(ps2)
40+ C.lua_pushstring(C.pry_L, c2)
41+ C.free(unsafe.Pointer(c2))
42+
43+ C.lua_setfield(C.pry_L, C.LUA_GLOBALSINDEX, C.CString("_PROMPT2"))
44+}
45+
3546func (p Lua) Eval(code string) {
3647 ccode := C.CString(code)
3748 defer C.free(unsafe.Pointer(ccode))
3849 C.pry_eval(ccode)
3950}
4051
41−func (p Lua) EvalFile(file string, args []string) {
52+func (p Lua) EvalFile(file string) {
4253 cfile := C.CString(file)
4354 defer C.free(unsafe.Pointer(cfile))
4455
45− argv := C.CString(file + "\x00" + strings.Join(args, "\x00"))
46− defer C.free(unsafe.Pointer(argv))
47− C.pry_eval_file(cfile, C.int(len(args)+1), argv)
56+ C.pry_eval_file(cfile)
4857}
4958
5059func (p Lua) REPL() {
51− fn := C.CString("<stdin>")
52− defer C.free(unsafe.Pointer(fn))
53− C.dotty(C.pry_L)
60+ C.pry_do_repl()
5461}
5562
5663func (p Lua) Close() {
languages/lua/pry.c+4−34
@@ -5,42 +5,12 @@
55
66#include "pry.h"
77
8−char* pry_prompt = "> ";
9−char* pry_prompt2 = ">> ";
108lua_State *pry_L;
119
12−const char * pry_get_version() {
13− return LUA_COPYRIGHT;
14−}
10+const char *pry_get_version(void) { return LUA_RELEASE " " LUA_COPYRIGHT; }
1511
12+void pry_eval(const char *code) { dostring(pry_L, code, "<eval>"); }
1613
17−void pry_init() {
18− pry_L = luaL_newstate();
19− luaL_openlibs(pry_L);
20−}
14+void pry_do_repl(void) { dotty(pry_L); }
2115
22−void pry_eval(const char *code) {
23− luaL_dostring(pry_L, code);
24−}
25−
26−
27−int lua_main (int argc, char **argv);
28−
29−void pry_main() {
30− char* args[2] = {"lua", NULL};
31− lua_main(0, args);
32−}
33−
34−int handle_script (lua_State *L, char **argv, int n);
35−void pry_eval_file(const char* file, int argn, const char *argv) {
36− int status, result;
37− const char* xargv[argn+1];
38− const char* ptr = argv;
39− for (int i = 0; i < argn; ++i) {
40− xargv[i] = ptr;
41− ptr += strlen(ptr) + 1;
42− }
43− xargv[argn] = NULL;
44−
45− handle_script(pry_L, xargv, 0);
46−}
16+void pry_eval_file(char *file) { handle_script(pry_L, &file, 0); }
languages/lua/pry.h+8−11
@@ -1,16 +1,13 @@
11#include <lua.h>
22
3−#define luai_writestring(s,l) fwrite((s), sizeof(char), (l), stdout)
4−#define luai_writeline() (luai_writestring("\n", 1), fflush(stdout))
5−#define LUA_PROMPT pry_prompt
6−#define LUA_PROMPT2 pry_prompt2
7−
83extern lua_State *pry_L;
9−extern char* pry_prompt;
10−extern char* pry_prompt2;
114
12−const char * pry_get_version();
13−void pry_init();
5+const char *pry_get_version(void);
146void pry_eval(const char *code);
15−void pry_main();
16−void pry_eval_file(const char* file, int argn, const char *argv);
7+void pry_eval_file(char *file);
8+void pry_do_repl(void);
9+
10+// from the lua repl lib (lua.c)
11+void dotty(lua_State *L);
12+int handle_script(lua_State *L, char **argv, int n);
13+int dostring(lua_State *L, const char *s, const char *name);
languages/python2/main.go+3−3
@@ -17,7 +17,7 @@ type Python struct{}
1717
1818func (p Python) Open() {
1919 C.Py_Initialize()
20− p.LoadModule("readline")
20+ p.loadModule("readline")
2121 p.Eval("import signal")
2222 p.Eval("signal.signal(signal.SIGINT, signal.default_int_handler)")
2323}
@@ -62,14 +62,14 @@ func (p Python) REPLLikeEval(code string) {
6262 C.pry_eval(ccode, C.Py_single_input)
6363}
6464
65−func (p Python) LoadModule(mod string) {
65+func (p Python) loadModule(mod string) {
6666 cmode := C.CString(mod)
6767 defer C.free(unsafe.Pointer(cmode))
6868 C.PyImport_ImportModule(cmode)
6969}
7070
7171func (p Python) REPL() {
72− p.LoadModule("readline")
72+ p.loadModule("readline")
7373
7474 fn := C.CString("<stdin>")
7575 defer C.free(unsafe.Pointer(fn))
languages/python3/main.go+2−2
@@ -18,7 +18,7 @@ type Python struct{}
1818
1919func (p Python) Open() {
2020 C.Py_Initialize()
21− p.LoadModule("readline")
21+ p.loadModule("readline")
2222 p.Eval("import signal")
2323 p.Eval("signal.signal(signal.SIGINT, signal.default_int_handler)")
2424}
@@ -63,7 +63,7 @@ func (p Python) REPLLikeEval(code string) {
6363 C.pry_eval(ccode, C.Py_single_input)
6464}
6565
66−func (p Python) LoadModule(mod string) {
66+func (p Python) loadModule(mod string) {
6767 cmode := C.CString(mod)
6868 defer C.free(unsafe.Pointer(cmode))
6969 C.PyImport_ImportModule(cmode)
test_files/hello.luanew file+2
@@ -0,0 +1,2 @@
1+a = "hello"
2+print("hi!")
tests/lua/always_try_expression.expnew file+26
@@ -0,0 +1,26 @@
1+#!/usr/bin/expect -f
2+
3+set timeout -1
4+spawn ./prybar-lua -q -i
5+match_max 100000
6+expect -exact "--> "
7+send -- "function a() return 123 end\r"
8+expect -exact "function a() return 123 end\r
9+--> "
10+send -- "a()\r"
11+expect -exact "a()\r
12+123\r
13+--> "
14+send -- "return a()\r"
15+expect -exact "return a()\r
16+123\r
17+--> "
18+send -- "a(\r"
19+expect -exact "a(\r
20+... "
21+send -- ")\r"
22+expect -exact ")\r
23+123\r
24+--> "
25+send -- ""
26+expect eof
tests/lua/history.expnew file+30
@@ -0,0 +1,30 @@
1+#!/usr/bin/expect -f
2+
3+set timeout -1
4+spawn ./prybar-lua -q -i
5+match_max 100000
6+expect -exact "--> "
7+send -- "1\r"
8+expect -exact "1\r
9+1\r
10+--> "
11+send -- "2\r"
12+expect -exact "2\r
13+2\r
14+--> "
15+send -- "3\r"
16+expect -exact "3\r
17+3\r
18+--> "
19+send -- "\[A"
20+expect -exact "3"
21+send -- "\[A"
22+expect -exact "2"
23+send -- "\[A"
24+expect -exact "1"
25+send -- "\r"
26+expect -exact "\r
27+1\r
28+--> "
29+send -- ""
30+expect eof
tests/lua/load_file.expnew file+14
@@ -0,0 +1,14 @@
1+#!/usr/bin/expect -f
2+
3+set timeout -1
4+spawn ./prybar-lua -i ./test_files/hello.lua
5+match_max 100000
6+expect -exact "Lua 5.1.5 Copyright (C) 1994-2012 Lua.org, PUC-Rio\r
7+hi!\r
8+--> "
9+send -- "a\r"
10+expect -exact "a\r
11+hello\r
12+--> "
13+send -- ""
14+expect eof
tests/lua/own_eval.expnew file+51
@@ -0,0 +1,51 @@
1+#!/usr/bin/expect -f
2+
3+set timeout -1
4+spawn ./prybar-lua -I
5+match_max 100000
6+expect -exact "Lua 5.1.5 Copyright (C) 1994-2012 Lua.org, PUC-Rio\r
7+--> "
8+send -- "1"
9+expect -exact "\r--> 1\[0K\r\[5C"
10+send -- "+"
11+expect -exact "\r--> 1+\[0K\r\[6C"
12+send -- "1"
13+expect -exact "\r--> 1+1\[0K\r\[7C"
14+send -- "\r"
15+expect -exact "\r--> 1+1\[0K\r\[7C\r
16+lua: \[string \"<eval>\"\]:1: unexpected symbol near '1'\r
17+--> "
18+send -- "r"
19+expect -exact "\r--> r\[0K\r\[5C"
20+send -- "e"
21+expect -exact "\r--> re\[0K\r\[6C"
22+send -- "t"
23+expect -exact "\r--> ret\[0K\r\[7C"
24+send -- "u"
25+expect -exact "\r--> retu\[0K\r\[8C"
26+send -- "r"
27+expect -exact "\r--> retur\[0K\r\[9C"
28+send -- "n"
29+expect -exact "\r--> return\[0K\r\[10C"
30+send -- " "
31+expect -exact "\r--> return \[0K\r\[11C"
32+send -- "1"
33+expect -exact "\r--> return 1\[0K\r\[12C"
34+send -- "\r"
35+expect -exact "\r--> return 1\[0K\r\[12C\r
36+--> "
37+send -- "a"
38+expect -exact "\r--> a\[0K\r\[5C"
39+send -- " "
40+expect -exact "\r--> a \[0K\r\[6C"
41+send -- ""
42+expect -exact "\r--> a\[0K\r\[5C"
43+send -- "="
44+expect -exact "\r--> a=\[0K\r\[6C"
45+send -- "1"
46+expect -exact "\r--> a=1\[0K\r\[7C"
47+send -- "\r"
48+expect -exact "\r--> a=1\[0K\r\[7C\r
49+--> "
50+send -- ""
51+expect eof
tests/lua/ps1_ps2.expnew file+18
@@ -0,0 +1,18 @@
1+#!/usr/bin/expect -f
2+
3+set timeout -1
4+spawn ./prybar-lua -i -ps1 ps1 -ps2 ps2
5+match_max 100000
6+expect -exact "Lua 5.1.5 Copyright (C) 1994-2012 Lua.org, PUC-Rio\r
7+ps1"
8+send -- "a(\r"
9+expect -exact "a(\r
10+ps2"
11+send -- ")\r"
12+expect -exact ")\r
13+stdin:1: attempt to call global 'a' (a nil value)\r
14+stack traceback:\r
15+ stdin:1: in main chunk\r
16+ps1"
17+send -- ""
18+expect eof
tests/lua/quiet.expnew file+12
@@ -0,0 +1,12 @@
1+#!/usr/bin/expect -f
2+
3+set timeout -1
4+spawn ./prybar-lua -q -i
5+match_max 100000
6+expect -exact "--> "
7+send -- "1+1\r"
8+expect -exact "1+1\r
9+2\r
10+--> "
11+send -- ""
12+expect eof
tests/lua/returns.expnew file+19
@@ -0,0 +1,19 @@
1+#!/usr/bin/expect -f
2+
3+set timeout -1
4+spawn ./prybar-lua -q -i
5+match_max 100000
6+expect -exact "--> "
7+send -- "123\r"
8+expect -exact "123\r
9+123\r
10+--> "
11+send -- "function a() print(1) end\r"
12+expect -exact "function a() print(1) end\r
13+--> "
14+send -- "a()\r"
15+expect -exact "a()\r
16+1\r
17+--> "
18+send -- ""
19+expect eof