You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by ce...@apache.org on 2007/11/22 00:25:31 UTC
svn commit: r597259 -
/xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Saver.java
Author: cezar
Date: Wed Nov 21 15:25:31 2007
New Revision: 597259
URL: http://svn.apache.org/viewvc?rev=597259&view=rev
Log:
More general asserts.
drt passes.
Modified:
xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Saver.java
Modified: xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Saver.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Saver.java?rev=597259&r1=597258&r2=597259&view=diff
==============================================================================
--- xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Saver.java (original)
+++ xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Saver.java Wed Nov 21 15:25:31 2007
@@ -907,7 +907,12 @@
_in = _out = 0;
_free = 0;
- assert _buf==null || _free == (_in>=_out ? _buf.length - (_in - _out) : _out - _in ) : "_buf.length:" + _buf.length + " _in:" + _in + " _out:" + _out + " _free:" + _free;
+ assert _buf==null ||
+ (_out<_in && _free == _buf.length - ( _in - _out ) ) || // data in the middle, free on the edges
+ (_out>_in && _free == _out - _in ) || // data on the edges, free in the middle
+ (_out==_in && _free == _buf.length) || // no data, all buffer free
+ (_out==_in && _free == 0) // buffer full
+ : "_buf.length:" + _buf.length + " _in:" + _in + " _out:" + _out + " _free:" + _free;
if (encoding != null && !noSaveDecl)
{
@@ -1146,7 +1151,12 @@
private void emit ( char ch )
{
- assert _buf==null || _free == (_in>=_out ? _buf.length - (_in - _out) : _out - _in ) : "_buf.length:" + _buf.length + " _in:" + _in + " _out:" + _out + " _free:" + _free;
+ assert _buf==null ||
+ (_out<_in && _free == _buf.length - ( _in - _out ) ) || // data in the middle, free on the edges
+ (_out>_in && _free == _out - _in ) || // data on the edges, free in the middle
+ (_out==_in && _free == _buf.length) || // no data, all buffer free
+ (_out==_in && _free == 0) // buffer full
+ : "_buf.length:" + _buf.length + " _in:" + _in + " _out:" + _out + " _free:" + _free;
preEmit( 1 );
@@ -1154,7 +1164,12 @@
_in = (_in + 1) % _buf.length;
- assert _buf==null || _free == (_in>=_out ? _buf.length - (_in - _out) : _out - _in ) : "_buf.length:" + _buf.length + " _in:" + _in + " _out:" + _out + " _free:" + _free;
+ assert _buf==null ||
+ (_out<_in && _free == _buf.length - ( _in - _out ) ) || // data in the middle, free on the edges
+ (_out>_in && _free == _out - _in ) || // data on the edges, free in the middle
+ (_out==_in && _free == _buf.length) || // no data, all buffer free
+ (_out==_in && _free == 0) // buffer full
+ : "_buf.length:" + _buf.length + " _in:" + _in + " _out:" + _out + " _free:" + _free;
}
private void emit ( char ch1, char ch2 )
@@ -1167,11 +1182,23 @@
_buf[ _in ] = ch2;
_in = (_in + 1) % _buf.length;
+
+ assert _buf==null ||
+ (_out<_in && _free == _buf.length - ( _in - _out ) ) || // data in the middle, free on the edges
+ (_out>_in && _free == _out - _in ) || // data on the edges, free in the middle
+ (_out==_in && _free == _buf.length) || // no data, all buffer free
+ (_out==_in && _free == 0) // buffer full
+ : "_buf.length:" + _buf.length + " _in:" + _in + " _out:" + _out + " _free:" + _free;
}
private void emit ( String s )
{
- assert _buf==null || _free == (_in>=_out ? _buf.length - (_in - _out) : _out - _in ) : "_buf.length:" + _buf.length + " _in:" + _in + " _out:" + _out + " _free:" + _free;
+ assert _buf==null ||
+ (_out<_in && _free == _buf.length - ( _in - _out ) ) || // data in the middle, free on the edges
+ (_out>_in && _free == _out - _in ) || // data on the edges, free in the middle
+ (_out==_in && _free == _buf.length) || // no data, all buffer free
+ (_out==_in && _free == 0) // buffer full
+ : "_buf.length:" + _buf.length + " _in:" + _in + " _out:" + _out + " _free:" + _free;
int cch = s == null ? 0 : s.length();
@@ -1192,7 +1219,12 @@
_in = (_in + cch) % _buf.length;
}
- assert _free == (_in>=_out ? _buf.length - (_in - _out) : _out - _in ) : "_buf.length:" + _buf.length + " _in:" + _in + " _out:" + _out + " _free:" + _free;
+ assert _buf==null ||
+ (_out<_in && _free == _buf.length - ( _in - _out ) ) || // data in the middle, free on the edges
+ (_out>_in && _free == _out - _in ) || // data on the edges, free in the middle
+ (_out==_in && _free == _buf.length) || // no data, all buffer free
+ (_out==_in && _free == 0) // buffer full
+ : "_buf.length:" + _buf.length + " _in:" + _in + " _out:" + _out + " _free:" + _free;
}
private void emit ( SaveCur c )
@@ -1226,7 +1258,12 @@
private boolean preEmit ( int cch )
{
assert cch >= 0;
- assert _buf==null || _free == (_in>=_out ? _buf.length - (_in - _out) : _out - _in ) : "_buf.length:" + _buf.length + " _in:" + _in + " _out:" + _out + " _free:" + _free;
+ assert _buf==null ||
+ (_out<_in && _free == _buf.length - ( _in - _out ) ) || // data in the middle, free on the edges
+ (_out>_in && _free == _out - _in ) || // data on the edges, free in the middle
+ (_out==_in && _free == _buf.length) || // no data, all buffer free
+ (_out==_in && _free == 0) // buffer full
+ : "_buf.length:" + _buf.length + " _in:" + _in + " _out:" + _out + " _free:" + _free;
_lastEmitCch = cch;
@@ -1257,15 +1294,20 @@
assert _free >= 0;
assert _buf==null || _free == (_in>=_out ? _buf.length - (_in - _out) : _out - _in ) - cch : "_buf.length:" + _buf.length + " _in:" + _in + " _out:" + _out + " _free:" + _free;
+ assert _buf==null ||
+ (_out<_in && _free == _buf.length - ( _in - _out ) - cch) || // data in the middle, free on the edges
+ (_out>_in && _free == _out - _in - cch ) || // data on the edges, free in the middle
+ (_out==_in && _free == _buf.length - cch) || // no data, all buffer free
+ (_out==_in && _free == 0) // buffer full
+ : "_buf.length:" + _buf.length + " _in:" + _in + " _out:" + _out + " _free:" + _free;
return false;
}
private void entitizeContent ( )
{
- assert _free >= 0;
- assert _buf==null || _free == (_in>=_out ? _buf.length - (_in - _out) : _out - _in ) : "_buf.length:" + _buf.length + " _in:" + _in + " _out:" + _out + " _free:" + _free;
-
+ assert _free >=0;
+
if (_lastEmitCch == 0)
return;
@@ -1362,8 +1404,6 @@
i = 0;
}
}
-
- assert _buf==null || _free == (_in>=_out ? _buf.length - (_in - _out) : _out - _in ) : "_buf.length:" + _buf.length + " _in:" + _in + " _out:" + _out + " _free:" + _free;
}
private void entitizeAttrValue ( )
@@ -1562,7 +1602,12 @@
_free -= dCch;
assert _free >= 0;
- assert _free == (_in>=_out ? _buf.length - (_in - _out) : _out - _in ) : "_buf.length:" + _buf.length + " _in:" + _in + " _out:" + _out + " _free:" + _free;
+ assert _buf==null ||
+ (_out<_in && _free == _buf.length - ( _in - _out ) ) || // data in the middle, free on the edges
+ (_out>_in && _free == _out - _in ) || // data on the edges, free in the middle
+ (_out==_in && _free == _buf.length) || // no data, all buffer free
+ (_out==_in && _free == 0) // buffer full
+ : "_buf.length:" + _buf.length + " _in:" + _in + " _out:" + _out + " _free:" + _free;
return (i + dCch + 1) % _buf.length;
}
@@ -1603,7 +1648,12 @@
assert _free >= 0;
assert cch > 0;
assert cch >= _free;
- assert _buf==null || _free == (_in>=_out ? _buf.length - (_in - _out) : _out - _in ) : "_buf.length:" + _buf.length + " _in:" + _in + " _out:" + _out + " _free:" + _free;
+ assert _buf==null ||
+ (_out<_in && _free == _buf.length - ( _in - _out ) ) || // data in the middle, free on the edges
+ (_out>_in && _free == _out - _in ) || // data on the edges, free in the middle
+ (_out==_in && _free == _buf.length) || // no data, all buffer free
+ (_out==_in && _free == 0) // buffer full
+ : "_buf.length:" + _buf.length + " _in:" + _in + " _out:" + _out + " _free:" + _free;
int newLen = _buf == null ? _initialBufSize : _buf.length * 2;
int used = getAvailable();
@@ -1643,7 +1693,12 @@
_buf = newBuf;
assert _free >= 0;
- assert _buf==null || _free == (_in>=_out ? _buf.length - (_in - _out) : _out - _in ) : "_buf.length:" + _buf.length + " _in:" + _in + " _out:" + _out + " _free:" + _free;
+ assert _buf==null ||
+ (_out<_in && _free == _buf.length - ( _in - _out ) ) || // data in the middle, free on the edges
+ (_out>_in && _free == _out - _in ) || // data on the edges, free in the middle
+ (_out==_in && _free == _buf.length) || // no data, all buffer free
+ (_out==_in && _free == 0) // buffer full
+ : "_buf.length:" + _buf.length + " _in:" + _in + " _out:" + _out + " _free:" + _free;
return i;
}
@@ -1660,7 +1715,12 @@
_out = (_out + 1) % _buf.length;
_free++;
- assert _buf==null || _free == (_in>=_out ? _buf.length - (_in - _out) : _out - _in ) : "_buf.length:" + _buf.length + " _in:" + _in + " _out:" + _out + " _free:" + _free;
+ assert _buf==null ||
+ (_out<_in && _free == _buf.length - ( _in - _out ) ) || // data in the middle, free on the edges
+ (_out>_in && _free == _out - _in ) || // data on the edges, free in the middle
+ (_out==_in && _free == _buf.length) || // no data, all buffer free
+ (_out==_in && _free == 0) // buffer full
+ : "_buf.length:" + _buf.length + " _in:" + _in + " _out:" + _out + " _free:" + _free;
return ch;
}
@@ -1702,7 +1762,12 @@
_out = (_out + len) % _buf.length;
_free += len;
- assert _buf==null || _free == (_in>=_out ? _buf.length - (_in - _out) : _out - _in ) : "_buf.length:" + _buf.length + " _in:" + _in + " _out:" + _out + " _free:" + _free;
+ assert _buf==null ||
+ (_out<_in && _free == _buf.length - ( _in - _out ) ) || // data in the middle, free on the edges
+ (_out>_in && _free == _out - _in ) || // data on the edges, free in the middle
+ (_out==_in && _free == _buf.length) || // no data, all buffer free
+ (_out==_in && _free == 0) // buffer full
+ : "_buf.length:" + _buf.length + " _in:" + _in + " _out:" + _out + " _free:" + _free;
assert _free >= 0;
@@ -1744,7 +1809,12 @@
_in = 0;
}
- assert _buf==null || _free == (_in>=_out ? _buf.length - (_in - _out) : _out - _in ) : "_buf.length:" + _buf.length + " _in:" + _in + " _out:" + _out + " _free:" + _free;
+ assert _buf==null ||
+ (_out<_in && _free == _buf.length - ( _in - _out ) ) || // data in the middle, free on the edges
+ (_out>_in && _free == _out - _in ) || // data on the edges, free in the middle
+ (_out==_in && _free == _buf.length) || // no data, all buffer free
+ (_out==_in && _free == 0) // buffer full
+ : "_buf.length:" + _buf.length + " _in:" + _in + " _out:" + _out + " _free:" + _free;
return charsAvailable;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org