annotate core/src/luan/modules/Io.luan @ 753:5e3970ccd86a

improve password handling
author Franklin Schmidt <fschmidt@gmail.com>
date Fri, 15 Jul 2016 17:35:50 -0600
parents 293c397e8dee
children 55983a476a21
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
321
7f7708e8fdd4 remove import statement
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 320
diff changeset
1 java()
7f7708e8fdd4 remove import statement
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 320
diff changeset
2 local IoLuan = require "java:luan.modules.IoLuan"
7f7708e8fdd4 remove import statement
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 320
diff changeset
3 local System = require "java:java.lang.System"
297
899253043270 remove PackageLuan.load_lib()
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
4
503
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 435
diff changeset
5 local M = {}
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 435
diff changeset
6
701
d0280c7fdc3a add Io.ip()
Franklin Schmidt <fschmidt@gmail.com>
parents: 694
diff changeset
7 M.ip = IoLuan.ip
503
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 435
diff changeset
8 M.read_console_line = IoLuan.read_console_line
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 435
diff changeset
9 M.schemes = IoLuan.newSchemes()
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 435
diff changeset
10 M.uri = IoLuan.uri
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 435
diff changeset
11 M.stdin = IoLuan.defaultStdin.table()
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 435
diff changeset
12 M.socket_server = IoLuan.socket_server
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 435
diff changeset
13 M.stdout = IoLuan.textWriter(System.out)
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 435
diff changeset
14 M.stderr = IoLuan.textWriter(System.err)
298
2ce23c7e2342 remove init.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 297
diff changeset
15
753
5e3970ccd86a improve password handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 746
diff changeset
16 -- used by http and rpc
5e3970ccd86a improve password handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 746
diff changeset
17 M.password = "password"
298
2ce23c7e2342 remove init.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 297
diff changeset
18
693
ca169567ce07 module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents: 680
diff changeset
19 local Luan = require "luan:Luan.luan"
554
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
20 local error = Luan.error
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
21 local to_string = Luan.to_string or error()
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
22 local type = Luan.type or error()
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
23 local try = Luan.try or error()
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
24 local ipairs = Luan.ipairs or error()
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
25 local pairs = Luan.pairs or error()
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
26 local values = Luan.values or error()
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
27 local load = Luan.load or error()
693
ca169567ce07 module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents: 680
diff changeset
28 local Table = require "luan:Table.luan"
554
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
29 local unpack = Table.unpack or error()
693
ca169567ce07 module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents: 680
diff changeset
30 local String = require "luan:String.luan"
554
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
31 local encode = String.encode or error()
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
32 local matches = String.matches or error()
539
473e456444ff Remove object-oriented primitive methods for string and binary
Franklin Schmidt <fschmidt@gmail.com>
parents: 503
diff changeset
33
320
fed1893821bf remove global namespace
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 319
diff changeset
34
680
ecd436959855 improve template statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 629
diff changeset
35 -- do not change
ecd436959855 improve template statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 629
diff changeset
36 function M.template_write(...)
ecd436959855 improve template statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 629
diff changeset
37 return M.stdout.write(...)
ecd436959855 improve template statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 629
diff changeset
38 end
ecd436959855 improve template statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 629
diff changeset
39
ecd436959855 improve template statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 629
diff changeset
40
503
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 435
diff changeset
41 function M.print_to(out,...)
298
2ce23c7e2342 remove init.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 297
diff changeset
42 local list = {}
539
473e456444ff Remove object-oriented primitive methods for string and binary
Franklin Schmidt <fschmidt@gmail.com>
parents: 503
diff changeset
43 for v in values(...) do
298
2ce23c7e2342 remove init.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 297
diff changeset
44 list[#list+1] = to_string(v)
2ce23c7e2342 remove init.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 297
diff changeset
45 list[#list+1] = '\t'
2ce23c7e2342 remove init.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 297
diff changeset
46 end
554
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
47 if #list > 0 then
298
2ce23c7e2342 remove init.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 297
diff changeset
48 list[#list] = '\n'
539
473e456444ff Remove object-oriented primitive methods for string and binary
Franklin Schmidt <fschmidt@gmail.com>
parents: 503
diff changeset
49 out.write( unpack(list) )
298
2ce23c7e2342 remove init.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 297
diff changeset
50 end
2ce23c7e2342 remove init.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 297
diff changeset
51 end
2ce23c7e2342 remove init.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 297
diff changeset
52
503
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 435
diff changeset
53 function M.print(...)
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 435
diff changeset
54 M.print_to(M.stdout,...)
298
2ce23c7e2342 remove init.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 297
diff changeset
55 end
392
8668f3799ad9 add Io.dont_write_when_no
Franklin Schmidt <fschmidt@gmail.com>
parents: 321
diff changeset
56
8668f3799ad9 add Io.dont_write_when_no
Franklin Schmidt <fschmidt@gmail.com>
parents: 321
diff changeset
57
589
97c8ae330efe add varargs to Luan.try;
Franklin Schmidt <fschmidt@gmail.com>
parents: 554
diff changeset
58 function M.output_to(out,fn,...)
97c8ae330efe add varargs to Luan.try;
Franklin Schmidt <fschmidt@gmail.com>
parents: 554
diff changeset
59 local old_out = M.stdout
97c8ae330efe add varargs to Luan.try;
Franklin Schmidt <fschmidt@gmail.com>
parents: 554
diff changeset
60 return try( {
97c8ae330efe add varargs to Luan.try;
Franklin Schmidt <fschmidt@gmail.com>
parents: 554
diff changeset
61 function(...)
97c8ae330efe add varargs to Luan.try;
Franklin Schmidt <fschmidt@gmail.com>
parents: 554
diff changeset
62 M.stdout = out
97c8ae330efe add varargs to Luan.try;
Franklin Schmidt <fschmidt@gmail.com>
parents: 554
diff changeset
63 fn(...)
97c8ae330efe add varargs to Luan.try;
Franklin Schmidt <fschmidt@gmail.com>
parents: 554
diff changeset
64 end;
97c8ae330efe add varargs to Luan.try;
Franklin Schmidt <fschmidt@gmail.com>
parents: 554
diff changeset
65 finally = function()
97c8ae330efe add varargs to Luan.try;
Franklin Schmidt <fschmidt@gmail.com>
parents: 554
diff changeset
66 M.stdout = old_out
97c8ae330efe add varargs to Luan.try;
Franklin Schmidt <fschmidt@gmail.com>
parents: 554
diff changeset
67 end;
97c8ae330efe add varargs to Luan.try;
Franklin Schmidt <fschmidt@gmail.com>
parents: 554
diff changeset
68 }, ... )
97c8ae330efe add varargs to Luan.try;
Franklin Schmidt <fschmidt@gmail.com>
parents: 554
diff changeset
69 end
97c8ae330efe add varargs to Luan.try;
Franklin Schmidt <fschmidt@gmail.com>
parents: 554
diff changeset
70
97c8ae330efe add varargs to Luan.try;
Franklin Schmidt <fschmidt@gmail.com>
parents: 554
diff changeset
71 local uri = M.uri -- make local
97c8ae330efe add varargs to Luan.try;
Franklin Schmidt <fschmidt@gmail.com>
parents: 554
diff changeset
72
97c8ae330efe add varargs to Luan.try;
Franklin Schmidt <fschmidt@gmail.com>
parents: 554
diff changeset
73 function M.output_of(fn,...)
97c8ae330efe add varargs to Luan.try;
Franklin Schmidt <fschmidt@gmail.com>
parents: 554
diff changeset
74 local string_uri = uri "string:"
97c8ae330efe add varargs to Luan.try;
Franklin Schmidt <fschmidt@gmail.com>
parents: 554
diff changeset
75 local out = string_uri.text_writer()
97c8ae330efe add varargs to Luan.try;
Franklin Schmidt <fschmidt@gmail.com>
parents: 554
diff changeset
76 M.output_to(out,fn,...)
97c8ae330efe add varargs to Luan.try;
Franklin Schmidt <fschmidt@gmail.com>
parents: 554
diff changeset
77 out.close()
97c8ae330efe add varargs to Luan.try;
Franklin Schmidt <fschmidt@gmail.com>
parents: 554
diff changeset
78 return string_uri.read_text()
97c8ae330efe add varargs to Luan.try;
Franklin Schmidt <fschmidt@gmail.com>
parents: 554
diff changeset
79 end
97c8ae330efe add varargs to Luan.try;
Franklin Schmidt <fschmidt@gmail.com>
parents: 554
diff changeset
80
97c8ae330efe add varargs to Luan.try;
Franklin Schmidt <fschmidt@gmail.com>
parents: 554
diff changeset
81
422
af82b266fe89 add Io.repr()
Franklin Schmidt <fschmidt@gmail.com>
parents: 402
diff changeset
82 -- repr
af82b266fe89 add Io.repr()
Franklin Schmidt <fschmidt@gmail.com>
parents: 402
diff changeset
83
680
ecd436959855 improve template statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 629
diff changeset
84 local function do_repr(out,obj,strict,done)
422
af82b266fe89 add Io.repr()
Franklin Schmidt <fschmidt@gmail.com>
parents: 402
diff changeset
85 local tp = type(obj)
af82b266fe89 add Io.repr()
Franklin Schmidt <fschmidt@gmail.com>
parents: 402
diff changeset
86 if tp == "table" then
af82b266fe89 add Io.repr()
Franklin Schmidt <fschmidt@gmail.com>
parents: 402
diff changeset
87 if done[obj] == true then
591
790d5de23042 add "strict" param to Io.repr();
Franklin Schmidt <fschmidt@gmail.com>
parents: 589
diff changeset
88 strict and error "circular reference"
680
ecd436959855 improve template statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 629
diff changeset
89 out.write "<circular reference>"
422
af82b266fe89 add Io.repr()
Franklin Schmidt <fschmidt@gmail.com>
parents: 402
diff changeset
90 return
af82b266fe89 add Io.repr()
Franklin Schmidt <fschmidt@gmail.com>
parents: 402
diff changeset
91 end
af82b266fe89 add Io.repr()
Franklin Schmidt <fschmidt@gmail.com>
parents: 402
diff changeset
92 done[obj] = true
680
ecd436959855 improve template statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 629
diff changeset
93 out.write( "{" )
422
af82b266fe89 add Io.repr()
Franklin Schmidt <fschmidt@gmail.com>
parents: 402
diff changeset
94 local is_first = true
af82b266fe89 add Io.repr()
Franklin Schmidt <fschmidt@gmail.com>
parents: 402
diff changeset
95 local in_list = {}
af82b266fe89 add Io.repr()
Franklin Schmidt <fschmidt@gmail.com>
parents: 402
diff changeset
96 for key, value in ipairs(obj) do
680
ecd436959855 improve template statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 629
diff changeset
97 if is_first then is_first = false else out.write ", " end
ecd436959855 improve template statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 629
diff changeset
98 do_repr(out,value,strict,done)
422
af82b266fe89 add Io.repr()
Franklin Schmidt <fschmidt@gmail.com>
parents: 402
diff changeset
99 in_list[key] = true
af82b266fe89 add Io.repr()
Franklin Schmidt <fschmidt@gmail.com>
parents: 402
diff changeset
100 end
af82b266fe89 add Io.repr()
Franklin Schmidt <fschmidt@gmail.com>
parents: 402
diff changeset
101 for key, value in pairs(obj) do
af82b266fe89 add Io.repr()
Franklin Schmidt <fschmidt@gmail.com>
parents: 402
diff changeset
102 if in_list[key] ~= true then
680
ecd436959855 improve template statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 629
diff changeset
103 if is_first then is_first = false else out.write ", " end
629
35dde32c02ab change String.matches()
Franklin Schmidt <fschmidt@gmail.com>
parents: 591
diff changeset
104 if type(key) == "string" and matches(key,"^[a-zA-Z_][a-zA-Z_0-9]*$") ~= nil then
680
ecd436959855 improve template statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 629
diff changeset
105 out.write( key )
424
Franklin Schmidt <fschmidt@gmail.com>
parents: 422
diff changeset
106 elseif type(key) == "table" then
680
ecd436959855 improve template statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 629
diff changeset
107 out.write( "[<", key, ">]" )
422
af82b266fe89 add Io.repr()
Franklin Schmidt <fschmidt@gmail.com>
parents: 402
diff changeset
108 else
680
ecd436959855 improve template statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 629
diff changeset
109 out.write "["
ecd436959855 improve template statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 629
diff changeset
110 do_repr(out,key,strict,done)
ecd436959855 improve template statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 629
diff changeset
111 out.write "]"
422
af82b266fe89 add Io.repr()
Franklin Schmidt <fschmidt@gmail.com>
parents: 402
diff changeset
112 end
680
ecd436959855 improve template statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 629
diff changeset
113 out.write "="
ecd436959855 improve template statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 629
diff changeset
114 do_repr(out,value,strict,done)
422
af82b266fe89 add Io.repr()
Franklin Schmidt <fschmidt@gmail.com>
parents: 402
diff changeset
115 end
af82b266fe89 add Io.repr()
Franklin Schmidt <fschmidt@gmail.com>
parents: 402
diff changeset
116 end
680
ecd436959855 improve template statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 629
diff changeset
117 out.write "}"
422
af82b266fe89 add Io.repr()
Franklin Schmidt <fschmidt@gmail.com>
parents: 402
diff changeset
118 elseif tp == "string" then
680
ecd436959855 improve template statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 629
diff changeset
119 out.write( '"', encode(obj), '"' )
422
af82b266fe89 add Io.repr()
Franklin Schmidt <fschmidt@gmail.com>
parents: 402
diff changeset
120 elseif tp == "nil" or tp == "boolean" or tp == "number" then
680
ecd436959855 improve template statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 629
diff changeset
121 out.write( obj )
422
af82b266fe89 add Io.repr()
Franklin Schmidt <fschmidt@gmail.com>
parents: 402
diff changeset
122 else
591
790d5de23042 add "strict" param to Io.repr();
Franklin Schmidt <fschmidt@gmail.com>
parents: 589
diff changeset
123 strict and error("can't repr type '"..tp.."' of "..obj)
680
ecd436959855 improve template statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 629
diff changeset
124 out.write( "<", obj, ">" )
422
af82b266fe89 add Io.repr()
Franklin Schmidt <fschmidt@gmail.com>
parents: 402
diff changeset
125 end
af82b266fe89 add Io.repr()
Franklin Schmidt <fschmidt@gmail.com>
parents: 402
diff changeset
126 end
af82b266fe89 add Io.repr()
Franklin Schmidt <fschmidt@gmail.com>
parents: 402
diff changeset
127
591
790d5de23042 add "strict" param to Io.repr();
Franklin Schmidt <fschmidt@gmail.com>
parents: 589
diff changeset
128 function M.repr(obj,strict)
680
ecd436959855 improve template statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 629
diff changeset
129 local string_uri = uri "string:"
ecd436959855 improve template statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 629
diff changeset
130 local out = string_uri.text_writer()
ecd436959855 improve template statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 629
diff changeset
131 do_repr(out,obj,strict or false,{})
ecd436959855 improve template statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 629
diff changeset
132 out.close()
ecd436959855 improve template statements
Franklin Schmidt <fschmidt@gmail.com>
parents: 629
diff changeset
133 return string_uri.read_text()
422
af82b266fe89 add Io.repr()
Franklin Schmidt <fschmidt@gmail.com>
parents: 402
diff changeset
134 end
af82b266fe89 add Io.repr()
Franklin Schmidt <fschmidt@gmail.com>
parents: 402
diff changeset
135
af82b266fe89 add Io.repr()
Franklin Schmidt <fschmidt@gmail.com>
parents: 402
diff changeset
136
392
8668f3799ad9 add Io.dont_write_when_no
Franklin Schmidt <fschmidt@gmail.com>
parents: 321
diff changeset
137 -- useful for SimplyHTML responsiveness
8668f3799ad9 add Io.dont_write_when_no
Franklin Schmidt <fschmidt@gmail.com>
parents: 321
diff changeset
138
503
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 435
diff changeset
139 local NO = {}
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 435
diff changeset
140 M.NO = NO
392
8668f3799ad9 add Io.dont_write_when_no
Franklin Schmidt <fschmidt@gmail.com>
parents: 321
diff changeset
141
503
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 435
diff changeset
142 function M.dont_write_when_no(write_fn)
392
8668f3799ad9 add Io.dont_write_when_no
Franklin Schmidt <fschmidt@gmail.com>
parents: 321
diff changeset
143 return function(...)
539
473e456444ff Remove object-oriented primitive methods for string and binary
Franklin Schmidt <fschmidt@gmail.com>
parents: 503
diff changeset
144 for v in values(...) do
392
8668f3799ad9 add Io.dont_write_when_no
Franklin Schmidt <fschmidt@gmail.com>
parents: 321
diff changeset
145 if v == NO then
8668f3799ad9 add Io.dont_write_when_no
Franklin Schmidt <fschmidt@gmail.com>
parents: 321
diff changeset
146 return
8668f3799ad9 add Io.dont_write_when_no
Franklin Schmidt <fschmidt@gmail.com>
parents: 321
diff changeset
147 end
8668f3799ad9 add Io.dont_write_when_no
Franklin Schmidt <fschmidt@gmail.com>
parents: 321
diff changeset
148 end
8668f3799ad9 add Io.dont_write_when_no
Franklin Schmidt <fschmidt@gmail.com>
parents: 321
diff changeset
149 write_fn(...)
8668f3799ad9 add Io.dont_write_when_no
Franklin Schmidt <fschmidt@gmail.com>
parents: 321
diff changeset
150 end
8668f3799ad9 add Io.dont_write_when_no
Franklin Schmidt <fschmidt@gmail.com>
parents: 321
diff changeset
151 end
503
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 435
diff changeset
152
554
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
153
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
154 -- debug
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
155
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
156 function M.debug(prompt)
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
157 prompt = prompt or "luan_debug> "
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
158 local function console()
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
159 return M.read_console_line(prompt)
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
160 end
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
161 local env = {}
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
162 for line in console do
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
163 try {
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
164 function()
694
b620b8e1010f remove Luan.load() allow_expression param and add Luan.eval()
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
165 local fn
b620b8e1010f remove Luan.load() allow_expression param and add Luan.eval()
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
166 try {
b620b8e1010f remove Luan.load() allow_expression param and add Luan.eval()
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
167 function()
b620b8e1010f remove Luan.load() allow_expression param and add Luan.eval()
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
168 fn = load("return "..line,"stdin",env)
b620b8e1010f remove Luan.load() allow_expression param and add Luan.eval()
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
169 end
b620b8e1010f remove Luan.load() allow_expression param and add Luan.eval()
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
170 catch = function(e)
b620b8e1010f remove Luan.load() allow_expression param and add Luan.eval()
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
171 fn = load(line,"stdin",env)
b620b8e1010f remove Luan.load() allow_expression param and add Luan.eval()
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
172 end
b620b8e1010f remove Luan.load() allow_expression param and add Luan.eval()
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
173 }
554
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
174 M.print( fn() )
694
b620b8e1010f remove Luan.load() allow_expression param and add Luan.eval()
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
175 end
554
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
176 catch = function(e)
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
177 M.print(e)
694
b620b8e1010f remove Luan.load() allow_expression param and add Luan.eval()
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
178 end
554
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
179 }
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
180 end
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
181 end
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
182
18504c41b0be move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents: 539
diff changeset
183
503
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 435
diff changeset
184 return M