6f6ebf4 · prybar · git.iko.soy

git.iko.soy/prybar

i guess we should always try to expression

commit6f6ebf464632eadb656744b1d92d46242d4a19a9 authormason clayton <masongclayton@gmail.com> dateWed 20 Feb 2019, 15:57 (8 years ago) parentc029e47

8 files changed+226−15

compare with master

unifiedsplit

languages/lua/lua.c+8−15 test_files/hello.lua+2 tests/lua/always_try_expression.exp+18 tests/lua/load_file.exp+14 tests/lua/own_eval.exp+93 tests/lua/ps1_ps2.exp+18 tests/lua/quiet.exp+12 tests/lua/returns.exp+61

languages/lua/lua.c+8−15

@@ -157,13 +157,9 @@ static int pushline(lua_State *L, int firstline) {

157157 return 1;

158158}

159159

160−static int try_expression(lua_State *L, int status) {

161− if (status != LUA_ERRSYNTAX) {

162− return 0;

163− }

164−

160+static int try_expression(lua_State *L) {

165161 lua_pushliteral(L, "return ");

166− lua_pushvalue(L, -3);

162+ lua_pushvalue(L, 1);

167163 lua_concat(L, 2);

168164

169165 int rstatus =

@@ -171,28 +167,25 @@ static int try_expression(lua_State *L, int status) {

171167

172168 if (rstatus) {

173169 lua_pop(L, 2);

174− return 0;

170+ return 1;

175171 }

176172

177− lua_remove(L, 2);

178173 lua_remove(L, 2);

179174

180− return 1;

175+ return 0;

181176}

182177

183178static int loadline(lua_State *L) {

184− int status;

179+ int status = 0;

185180 lua_settop(L, 0);

186181 if (!pushline(L, 1))

187182 return -1; /* no input */

188183

189184 for (;;) { /* repeat until gets a complete line */

190− status = luaL_loadbuffer(L, lua_tostring(L, 1), lua_strlen(L, 1), "=stdin");

191−

192− if (try_expression(L, status)) {

193− status = 0;

185+ if (!try_expression(L))

194186 break;

195− }

187+

188+ status = luaL_loadbuffer(L, lua_tostring(L, 1), lua_strlen(L, 1), "=stdin");

196189

197190 if (!incomplete(L, status))

198191 break; /* cannot try to add lines? */

test_files/hello.luanew file+2

@@ -0,0 +1,2 @@

1+a = "hello"

2+print("hi!")

tests/lua/always_try_expression.expnew file+18

@@ -0,0 +1,18 @@

1+#!/usr/bin/expect -f

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+--> "

13+send -- "return a()\r"

14+expect -exact "return a()\r

15+123\r

16+--> "

17+send -- ""

18+expect eof

tests/lua/load_file.expnew file+14

@@ -0,0 +1,14 @@

1+#!/usr/bin/expect -f

3+set timeout -1

4+spawn ./prybar-lua -i ./test_files/hello.lua

5+match_max 100000

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+93

@@ -0,0 +1,93 @@

1+#!/usr/bin/expect -f

2+#

3+# This Expect script was generated by autoexpect on Wed Feb 20 15:53:16 2019

4+# Expect and autoexpect were both written by Don Libes, NIST.

5+#

6+# Note that autoexpect does not guarantee a working script. It

7+# necessarily has to guess about certain things. Two reasons a script

8+# might fail are:

9+#

10+# 1) timing - A surprising number of programs (rn, ksh, zsh, telnet,

11+# etc.) and devices discard or ignore keystrokes that arrive "too

12+# quickly" after prompts. If you find your new script hanging up at

13+# one spot, try adding a short sleep just before the previous send.

14+# Setting "force_conservative" to 1 (see below) makes Expect do this

15+# automatically - pausing briefly before sending each character. This

16+# pacifies every program I know of. The -c flag makes the script do

17+# this in the first place. The -C flag allows you to define a

18+# character to toggle this mode off and on.

19+

20+set force_conservative 0 ;# set to 1 to force conservative mode even if

21+ ;# script wasn't run conservatively originally

22+if {$force_conservative} {

23+ set send_slow {1 .1}

24+ proc send {ignore arg} {

25+ sleep .1

26+ exp_send -s -- $arg

27+ }

28+}

29+

30+#

31+# 2) differing output - Some programs produce different output each time

32+# they run. The "date" command is an obvious example. Another is

33+# ftp, if it produces throughput statistics at the end of a file

34+# transfer. If this causes a problem, delete these patterns or replace

35+# them with wildcards. An alternative is to use the -p flag (for

36+# "prompt") which makes Expect only look for the last line of output

37+# (i.e., the prompt). The -P flag allows you to define a character to

38+# toggle this mode off and on.

39+#

40+# Read the man page for more info.

41+#

42+# -Don

43+

44+

45+set timeout -1

46+spawn ./prybar-lua -I

47+match_max 100000

49+--> "

50+send -- "1"

51+expect -exact "\r--> 1\[0K\r\[5C"

52+send -- "+"

53+expect -exact "\r--> 1+\[0K\r\[6C"

54+send -- "1"

55+expect -exact "\r--> 1+1\[0K\r\[7C"

56+send -- "\r"

57+expect -exact "\r--> 1+1\[0K\r\[7C\r

58+lua: \[string \"<eval>\"\]:1: unexpected symbol near '1'\r

59+--> "

60+send -- "r"

61+expect -exact "\r--> r\[0K\r\[5C"

62+send -- "e"

63+expect -exact "\r--> re\[0K\r\[6C"

64+send -- "t"

65+expect -exact "\r--> ret\[0K\r\[7C"

66+send -- "u"

67+expect -exact "\r--> retu\[0K\r\[8C"

68+send -- "r"

69+expect -exact "\r--> retur\[0K\r\[9C"

70+send -- "n"

71+expect -exact "\r--> return\[0K\r\[10C"

72+send -- " "

73+expect -exact "\r--> return \[0K\r\[11C"

74+send -- "1"

75+expect -exact "\r--> return 1\[0K\r\[12C"

76+send -- "\r"

77+expect -exact "\r--> return 1\[0K\r\[12C\r

78+--> "

79+send -- "a"

80+expect -exact "\r--> a\[0K\r\[5C"

81+send -- " "

82+expect -exact "\r--> a \[0K\r\[6C"

83+send -- ""

84+expect -exact "\r--> a\[0K\r\[5C"

85+send -- "="

86+expect -exact "\r--> a=\[0K\r\[6C"

87+send -- "1"

88+expect -exact "\r--> a=1\[0K\r\[7C"

89+send -- "\r"

90+expect -exact "\r--> a=1\[0K\r\[7C\r

91+--> "

92+send -- ""

93+expect eof

tests/lua/ps1_ps2.expnew file+18

@@ -0,0 +1,18 @@

1+#!/usr/bin/expect -f

3+set timeout -1

4+spawn ./prybar-lua -i -ps1 ps1 -ps2 ps2

5+match_max 100000

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

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+61

@@ -0,0 +1,61 @@

1+#!/usr/bin/expect -f

2+#

3+# This Expect script was generated by autoexpect on Wed Feb 20 15:56:43 2019