OSDN > Finden Software > quipu > SCM > hg > quipu > Commit

quipu
Fork

quipu: Commit

quipu mercurial repository

Revision	ac10c2f3511cbf4273b8e683eab64b82037506f0 (tree)
Zeit	2019-10-18 07:17:57
Autor	Agustina Arzille <avarzille@rise...>
Commiter	Agustina Arzille

Simplify 'sp_guard' usage

diff -r 624e45ae56c9 -r ac10c2f3511c array.cpp

--- a/array.cpp Thu Oct 17 18:51:24 2019 -0300

+++ b/array.cpp Thu Oct 17 19:17:57 2019 -0300

		@@ -161,7 +161,7 @@
161	161	}
162	162
163	163	raw_acc<array> rx (ap->len);
164		- sp_guard sg (interp, interp->stklen ());
	164	+ sp_guard sg (interp);
165	165	valref obr (interp, fixint (0));
166	166
167	167	interp->growstk (ap->len);

		@@ -428,7 +428,7 @@
428	428	if (save)
429	429	info.add_mapping (interp, *info.offset, ax.as_obj ());
430	430
431		- sp_guard g (interp, interp->stklen ());
	431	+ sp_guard g (interp);
432	432	interp->growstk (len);
433	433
434	434	for (uint32_t i = 0; i < len; ++i)

diff -r 624e45ae56c9 -r ac10c2f3511c interp.h

--- a/interp.h Thu Oct 17 18:51:24 2019 -0300

+++ b/interp.h Thu Oct 17 19:17:57 2019 -0300

		@@ -414,6 +414,10 @@
414	414	{
415	415	}
416	416
	417	+ sp_guard (interpreter *__interp) : sp_guard (__interp, __interp->stklen ())
	418	+ {
	419	+ }
	420	+
417	421	~sp_guard ()
418	422	{
419	423	this->interp->stkend = this->interp->stack + this->sp;

diff -r 624e45ae56c9 -r ac10c2f3511c io.cpp

--- a/io.cpp Thu Oct 17 18:51:24 2019 -0300

+++ b/io.cpp Thu Oct 17 19:17:57 2019 -0300

		@@ -631,7 +631,7 @@
631	631
632	632	object reader::read_table (object)
633	633	{
634		- sp_guard sg (this->interp, this->interp->stklen ());
	634	+ sp_guard sg (this->interp);
635	635	// Push equality and hash functions.
636	636	this->interp->push (NIL);
637	637	this->interp->push (NIL);

diff -r 624e45ae56c9 -r ac10c2f3511c table.cpp

--- a/table.cpp Thu Oct 17 18:51:24 2019 -0300

+++ b/table.cpp Thu Oct 17 19:17:57 2019 -0300

		@@ -866,7 +866,7 @@
866	866	object copy_u (interpreter *interp, object obj, bool deep)
867	867	{
868	868	table::iterator it (interp, obj);
869		- sp_guard sg (interp, interp->stklen ());
	869	+ sp_guard sg (interp);
870	870
871	871	interp->push (as_table(obj)->cmpfct);
872	872	interp->push (as_table(obj)->hashfct);

		@@ -938,7 +938,7 @@
938	938	if (save)
939	939	info.add_mapping (interp, info.offset, ret);
940	940
941		- sp_guard sg (interp, interp->stklen ());
	941	+ sp_guard sg (interp);
942	942	while (true)
943	943	{
944	944	if (strm->peekb (interp) == PACK_END)

diff -r 624e45ae56c9 -r ac10c2f3511c types.cpp

--- a/types.cpp Thu Oct 17 18:51:24 2019 -0300

+++ b/types.cpp Thu Oct 17 19:17:57 2019 -0300

		@@ -370,7 +370,7 @@
370	370	auto off = slots_insert (interp, *elem, &xaref(sh, 0), nshared);
371	371
372	372	if (!fixint_p (slotdef_index (tmp)))
373		- {
	373	+ { // A shared slot that belongs to this type.
374	374	slotdef_index(tmp) = fixint (off);
375	375	slotdef_index(*elem) = UNBOUND;
376	376	slotdef_flags(*elem) &= ~fixint (SLOTDEF_SHARED_FLG);