Mercurial > prosody-hg
comparison plugins/mod_console.lua @ 3043:1fadbb2e3ca0
Merge with 0.6
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 17 May 2010 11:56:36 +0100 |
| parents | 06f7d8054065 b5beb7b15ac4 |
| children | a6f89c72d305 |
comparison
equal
deleted
inserted
replaced
| 3009:06f7d8054065 | 3043:1fadbb2e3ca0 |
|---|---|
| 82 end | 82 end |
| 83 end | 83 end |
| 84 | 84 |
| 85 session.env._ = data; | 85 session.env._ = data; |
| 86 | 86 |
| 87 local chunk, err = loadstring("return "..data); | 87 local chunkname = "=console"; |
| 88 local chunk, err = loadstring("return "..data, chunkname); | |
| 88 if not chunk then | 89 if not chunk then |
| 89 chunk, err = loadstring(data); | 90 chunk, err = loadstring(data, chunkname); |
| 90 if not chunk then | 91 if not chunk then |
| 91 err = err:gsub("^%[string .-%]:%d+: ", ""); | 92 err = err:gsub("^%[string .-%]:%d+: ", ""); |
| 92 err = err:gsub("^:%d+: ", ""); | 93 err = err:gsub("^:%d+: ", ""); |
| 93 err = err:gsub("'<eof>'", "the end of the line"); | 94 err = err:gsub("'<eof>'", "the end of the line"); |
| 94 session.print("Sorry, I couldn't understand that... "..err); | 95 session.print("Sorry, I couldn't understand that... "..err); |
