OSDN > Buscar Software > quipu > SCM > hg > quipu > Commit

quipu
Fork

quipu: Commit

quipu mercurial repository

Revisión	528793b7897ea1438d9a964c5412287588b0e398 (tree)
Tiempo	2019-11-21 02:33:31
Autor	Agustina Arzille <avarzille@rise...>
Commiter	Agustina Arzille

Be less verbose

diff -r 3478e7f29b51 -r 528793b7897e quipu.cpp

--- a/quipu.cpp Tue Nov 19 18:50:00 2019 -0300

+++ b/quipu.cpp Wed Nov 20 14:33:31 2019 -0300

		@@ -91,12 +91,13 @@
91	91	interpreter *interp = main_interp;
92	92	valref last_expr (interp, intern (interp, "_"));
93	93	reader rd (interp, in_stream);
	94	+ stream outs = as_stream (out_stream), errs = as_stream (err_stream);
94	95	io_info info;
95	96
96	97	for (info.flags = 0 ; ; )
97	98	{
98		- as_stream(out_stream)->write (interp, "quipu> ", 7);
99		- as_stream(out_stream)->flush (interp);
	99	+ outs->write (interp, "quipu> ", 7);
	100	+ outs->flush (interp);
100	101
101	102	try
102	103	{

		@@ -105,35 +106,34 @@
105	106	break;
106	107
107	108	object evo = eval (interp, expr);
108		- xwrite (interp, as_stream(out_stream), evo, info);
	109	+ xwrite (interp, outs, evo, info);
109	110	symval(*last_expr) = evo;
110		- as_stream(out_stream)->putb (interp, '\n');
	111	+ outs->putb (interp, '\n');
111	112	}
112	113	catch (exception& exc)
113	114	{
114	115	if (interp->throw_frame != 0)
115		- print_backtrace (interp, interp->throw_frame,
116		- as_stream (err_stream), info);
	116	+ print_backtrace (interp, interp->throw_frame, errs, info);
117	117
118	118	object obj = exc.value;
119	119	if (xcons_p (obj))
120	120	{
121		- xwrite (interp, as_stream (err_stream), xcar (obj), info);
122		- as_stream(err_stream)->write (interp, ": ", 2);
123		- xwrite (interp, as_stream (err_stream), xcdr (obj), info);
	121	+ xwrite (interp, errs, xcar (obj), info);
	122	+ errs->write (interp, ": ", 2);
	123	+ xwrite (interp, errs, xcdr (obj), info);
124	124	}
125	125	else
126		- xwrite (interp, as_stream (err_stream), obj, info);
	126	+ xwrite (interp, errs, obj, info);
127	127
128		- as_stream(err_stream)->putb (interp, '\n');
129		- as_stream(err_stream)->flush (interp);
	128	+ errs->putb (interp, '\n');
	129	+ errs->flush (interp);
130	130
131	131	interp->reset_state ();
132	132	}
133	133	}
134	134
135		- as_stream(out_stream)->putb (interp, '\n');
136		- as_stream(out_stream)->flush (interp);
	135	+ outs->putb (interp, '\n');
	136	+ outs->flush (interp);
137	137	return (0);
138	138	}
139	139