From: Jean-Christophe Beaupré Date: Sun, 7 Dec 2014 05:56:58 +0000 (-0500) Subject: ropes: Fix `RopeBuffer.reverse`. X-Git-Tag: v0.7~73^2~2 X-Git-Url: http://nitlanguage.org ropes: Fix `RopeBuffer.reverse`. Signed-off-by: Jean-Christophe Beaupré --- diff --git a/lib/standard/ropes.nit b/lib/standard/ropes.nit index d41c021..df98433 100644 --- a/lib/standard/ropes.nit +++ b/lib/standard/ropes.nit @@ -383,15 +383,12 @@ class RopeBuffer end redef fun reverse do - str = str.reversed - var nns = new NativeString(buf_size) - var j = rpos - var mits = ns - for i in [0 .. rpos[ do - nns[i] = mits[j] - j -= 1 + # Flush the buffer in order to only have to reverse `str`. + if rpos > 0 and dumped != rpos then + str += new FlatString.with_infos(ns, rpos - dumped, dumped, rpos - 1) + dumped = rpos end - ns = nns + str = str.reversed end redef fun upper do diff --git a/tests/sav/test_ropes_buffer_reverse.res b/tests/sav/test_ropes_buffer_reverse.res new file mode 100644 index 0000000..eb577ea --- /dev/null +++ b/tests/sav/test_ropes_buffer_reverse.res @@ -0,0 +1,2 @@ +// +yxxxx diff --git a/tests/test_ropes_buffer_reverse.nit b/tests/test_ropes_buffer_reverse.nit new file mode 100644 index 0000000..e4a0170 --- /dev/null +++ b/tests/test_ropes_buffer_reverse.nit @@ -0,0 +1,29 @@ +# This file is part of NIT ( http://www.nitlanguage.org ). +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +module test_ropes_buffer_reverse + +import standard + +redef fun maxlen do return 3 + +var buffer = new RopeBuffer + +buffer.reverse +print "/{buffer}/" + +buffer.append("x" * (maxlen + 1)) +buffer.add 'y' +buffer.reverse +print buffer.to_s