Changeset d800676 for src/Parser/ExpressionNode.cc

Timestamp:

Mar 23, 2023, 12:18:39 PM (13 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master

Children:

c94b1f0

Parents:

1afd9ccb (diff), 18ea270 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/Parser/ExpressionNode.cc (modified) (1 diff)

src/Parser/ExpressionNode.cc

@@ -164 +164 @@
         } else {
                 // At least one digit in integer constant, so safe to backup while looking for suffix.
+                // This declaration and the comma expressions in the conditions mimic
+                // the declare and check pattern allowed in later compiler versions.
+                // (Only some early compilers/C++ standards do not support it.)
                 string::size_type posn;
                 // pointer value
-                if ( posn = str.find_last_of( "pP" ); posn != string::npos ) {
+                if ( posn = str.find_last_of( "pP" ), posn != string::npos ) {
                         ltype = 5; str.erase( posn, 1 );
                 // size_t
-                } else if ( posn = str.find_last_of( "zZ" ); posn != string::npos ) {
+                } else if ( posn = str.find_last_of( "zZ" ), posn != string::npos ) {
                         Unsigned = true; type = 2; ltype = 4; str.erase( posn, 1 );
                 // signed char
-                } else if ( posn = str.rfind( "hh" ); posn != string::npos ) {
+                } else if ( posn = str.rfind( "hh" ), posn != string::npos ) {
                         type = 1; str.erase( posn, 2 );
                 // signed char
-                } else if ( posn = str.rfind( "HH" ); posn != string::npos ) {
+                } else if ( posn = str.rfind( "HH" ), posn != string::npos ) {
                         type = 1; str.erase( posn, 2 );
                 // short
-                } else if ( posn = str.find_last_of( "hH" ); posn != string::npos ) {
+                } else if ( posn = str.find_last_of( "hH" ), posn != string::npos ) {
                         type = 0; str.erase( posn, 1 );
                 // int (natural number)
-                } else if ( posn = str.find_last_of( "nN" ); posn != string::npos ) {
+                } else if ( posn = str.find_last_of( "nN" ), posn != string::npos ) {
                         type = 2; str.erase( posn, 1 );
                 } else if ( str.rfind( "ll" ) != string::npos || str.rfind( "LL" ) != string::npos ) {