Changeset 806c18 in git for factory/var_intglobal.cc

Timestamp:

Nov 15, 2010, 4:34:57 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

7c3bca08c96331a56864c1d35b8c2e8ff2e0be89

Parents:

c840d97af622b4e4da8761738b540e21144f716b

Message:

format

git-svn-id: file:///usr/local/Singular/svn/trunk@13655 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• factory/var_intglobal.cc (modified) (8 diffs)

factory/var_intglobal.cc

@@ -41 +41 @@
     ASSERT( i >= 0, "array index less than zero" );
     if ( i < _size ) {
-        _initializedFlags[ i ] = true;
-        return _array[ i ];
+        _initializedFlags[ i ] = true;
+        return _array[ i ];
     } else {
-        // resize arrays
-        T * newArray = new T[ i+1 ];
-        bool * newFlags = new bool[ i+1 ];
-        int j = 0;
-        // copy old contents
-        while ( j < _size ) {
-            newArray[ j ] = _array[ j ];
-            newFlags[ j ] = _initializedFlags[ j ];
-            j++;
-        }
-        // mark rest as uninitialized
-        while ( j < i ) {
-            newFlags[ j ] = false;
-            j++;
-        }
-        // actual element mark as initialized
-        newFlags[ i ] = true;
-
-        // make new arrays actual ones
-        delete [] _array;
-        delete [] _initializedFlags;
-        _array = newArray;
-        _initializedFlags = newFlags;
-        _size = i + 1;
-
-        return _array[ i ];
+        // resize arrays
+        T * newArray = new T[ i+1 ];
+        bool * newFlags = new bool[ i+1 ];
+        int j = 0;
+        // copy old contents
+        while ( j < _size ) {
+            newArray[ j ] = _array[ j ];
+            newFlags[ j ] = _initializedFlags[ j ];
+            j++;
+        }
+        // mark rest as uninitialized
+        while ( j < i ) {
+            newFlags[ j ] = false;
+            j++;
+        }
+        // actual element mark as initialized
+        newFlags[ i ] = true;
+
+        // make new arrays actual ones
+        delete [] _array;
+        delete [] _initializedFlags;
+        _array = newArray;
+        _initializedFlags = newFlags;
+        _size = i + 1;
+
+        return _array[ i ];
     }
 }
@@ -87 +87 @@
     ASSERT( i >= 0, "array index less than zero" );
     if ( i >= _size )
-        return false;
+        return false;
     else
-        return _initializedFlags[ i ];
+        return _initializedFlags[ i ];
 }
 //}}}
@@ -106 +106 @@
     int i = 0;
     while ( i < _size && _initializedFlags[ i ] )
-        i++;
+        i++;
     return i;
 }
@@ -129 +129 @@
     delete [] _longName;
     if ( ! longName )
-        _longName = 0;
+        _longName = 0;
     else {
-        _longName = new char[ strlen( longName ) + 1 ];
-        strcpy( _longName, longName );
+        _longName = new char[ strlen( longName ) + 1 ];
+        strcpy( _longName, longName );
     }
 }
@@ -173 +173 @@
 {
     if ( this != &d ) {
-        initializeLongName( d._longName );
-        _name = d._name;
+        initializeLongName( d._longName );
+        _name = d._name;
     }
     return *this;
@@ -192 +192 @@
 {
     if ( ! lhs._longName && ! rhs._longName )
-        return true;
+        return true;
     if ( lhs._longName && rhs._longName )
-        return ! strcmp ( lhs._longName, rhs._longName );
+        return ! strcmp ( lhs._longName, rhs._longName );
     else
-        return false;
+        return false;
 }
 
@@ -216 +216 @@
 {
     if ( this != &d ) {
-        globalVarData::operator= ( d );
-        _mipo = d._mipo;
-        _reduce = d._reduce;
+        globalVarData::operator= ( d );
+        _mipo = d._mipo;
+        _reduce = d._reduce;
     }
     return *this;
@@ -234 +234 @@
 {
     if ( this != &d ) {
-        (globalVarData)*this = d;
-        _prim = d._prim;
+        (globalVarData)*this = d;
+        _prim = d._prim;
     }
     return *this;