Index: src/Parser/DeclarationNode.cc
===================================================================
--- src/Parser/DeclarationNode.cc	(revision 1cdc05268b619ea9d6ec7b9de830a9eaf68a8bf4)
+++ src/Parser/DeclarationNode.cc	(revision 15596d7ac54783f6279f404ef027e41002b4114f)
@@ -10,6 +10,6 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Feb 25 12:15:40 2023
-// Update Count     : 1404
+// Last Modified On : Tue Mar 14 08:54:13 2023
+// Update Count     : 1405
 //
 
@@ -600,10 +600,10 @@
 	} else {
 		switch ( dst->kind ) {
-		case TypeData::Unknown:
+		  case TypeData::Unknown:
 			src->qualifiers |= dst->qualifiers;
 			dst = src;
 			src = nullptr;
 			break;
-		case TypeData::Basic:
+		  case TypeData::Basic:
 			dst->qualifiers |= src->qualifiers;
 			if ( src->kind != TypeData::Unknown ) {
@@ -633,8 +633,8 @@
 			} // if
 			break;
-		default:
+		  default:
 			switch ( src->kind ) {
-			case TypeData::Aggregate:
-			case TypeData::Enum:
+			  case TypeData::Aggregate:
+			  case TypeData::Enum:
 				dst->base = new TypeData( TypeData::AggregateInst );
 				dst->base->aggInst.aggregate = src;
@@ -645,5 +645,5 @@
 				src = nullptr;
 				break;
-			default:
+			  default:
 				if ( dst->forall ) {
 					dst->forall->appendList( src->forall );
@@ -727,5 +727,5 @@
 	assert( type );
 	switch ( type->kind ) {
-	case TypeData::Symbolic:
+	  case TypeData::Symbolic:
 		if ( type->symbolic.assertions ) {
 			type->symbolic.assertions->appendList( assertions );
@@ -734,5 +734,5 @@
 		} // if
 		break;
-	default:
+	  default:
 		assert( false );
 	} // switch
@@ -833,6 +833,6 @@
 		if ( type ) {
 			switch ( type->kind ) {
-			case TypeData::Aggregate:
-			case TypeData::Enum:
+			  case TypeData::Aggregate:
+			  case TypeData::Enum:
 				p->type->base = new TypeData( TypeData::AggregateInst );
 				p->type->base->aggInst.aggregate = type;
@@ -843,5 +843,5 @@
 				break;
 
-			default:
+			  default:
 				p->type->base = type;
 			} // switch
@@ -865,11 +865,11 @@
 
 DeclarationNode * DeclarationNode::addNewArray( DeclarationNode * a ) {
-	if ( ! a ) return this;
+  if ( ! a ) return this;
 	assert( a->type->kind == TypeData::Array );
 	TypeData * lastArray = findLast( a->type );
 	if ( type ) {
 		switch ( type->kind ) {
-		case TypeData::Aggregate:
-		case TypeData::Enum:
+		  case TypeData::Aggregate:
+		  case TypeData::Enum:
 			lastArray->base = new TypeData( TypeData::AggregateInst );
 			lastArray->base->aggInst.aggregate = type;
@@ -879,5 +879,5 @@
 			lastArray->base->qualifiers |= type->qualifiers;
 			break;
-		default:
+		  default:
 			lastArray->base = type;
 		} // switch
@@ -1245,16 +1245,16 @@
 
 	switch ( type->kind ) {
-	case TypeData::Enum:
-	case TypeData::Aggregate: {
-		ReferenceToType * ret = buildComAggInst( type, attributes, linkage );
-		buildList( type->aggregate.actuals, ret->get_parameters() );
-		return ret;
-	}
-	case TypeData::Symbolic: {
-		TypeInstType * ret = new TypeInstType( buildQualifiers( type ), *type->symbolic.name, false, attributes );
-		buildList( type->symbolic.actuals, ret->get_parameters() );
-		return ret;
-	}
-	default:
+	  case TypeData::Enum:
+	  case TypeData::Aggregate: {
+		  ReferenceToType * ret = buildComAggInst( type, attributes, linkage );
+		  buildList( type->aggregate.actuals, ret->get_parameters() );
+		  return ret;
+	  }
+	  case TypeData::Symbolic: {
+		  TypeInstType * ret = new TypeInstType( buildQualifiers( type ), *type->symbolic.name, false, attributes );
+		  buildList( type->symbolic.actuals, ret->get_parameters() );
+		  return ret;
+	  }
+	  default:
 		Type * simpletypes = typebuild( type );
 		simpletypes->get_attributes() = attributes;		// copy because member is const
Index: src/Parser/ExpressionNode.cc
===================================================================
--- src/Parser/ExpressionNode.cc	(revision 1cdc05268b619ea9d6ec7b9de830a9eaf68a8bf4)
+++ src/Parser/ExpressionNode.cc	(revision 15596d7ac54783f6279f404ef027e41002b4114f)
@@ -9,7 +9,7 @@
 // Author           : Peter A. Buhr
 // Created On       : Sat May 16 13:17:07 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Thr Mar  0 10:46:00 2023
-// Update Count     : 1080
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Mar 14 09:10:22 2023
+// Update Count     : 1081
 //
 
@@ -122,5 +122,5 @@
 		if ( str[i] == '1' ) v |= 1;
 		i += 1;
-		if ( i == last - 1 || (str[i] != '0' && str[i] != '1') ) break;
+	  if ( i == last - 1 || (str[i] != '0' && str[i] != '1') ) break;
 		v <<= 1;
 	} // for
@@ -162,29 +162,31 @@
 	if ( isdigit( str[str.length() - 1] ) ) {			// no suffix ?
 		lnthSuffix( str, type, ltype );					// could have length suffix
-	// At least one digit in integer constant,
-	// so safe to backup while looking for suffix.
-	// pointer value
-	} else if ( auto posn = str.find_last_of( "pP" ) ; posn != string::npos ) {
-		ltype = 5; str.erase( posn, 1 );
-	// size_t
-	} else if ( auto posn = str.find_last_of( "zZ" ) ; posn != string::npos ) {
-		Unsigned = true; type = 2; ltype = 4; str.erase( posn, 1 );
-	// signed char
-	} else if ( auto posn = str.rfind( "hh" ) ; posn != string::npos ) {
-		type = 1; str.erase( posn, 2 );
-	// signed char
-	} else if ( auto posn = str.rfind( "HH" ) ; posn != string::npos ) {
-		type = 1; str.erase( posn, 2 );
-	// short
-	} else if ( auto posn = str.find_last_of( "hH" ) ; posn != string::npos ) {
-		type = 0; str.erase( posn, 1 );
-	// int (natural number)
-	} else if ( auto 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 ) {
-		type = 4;
 	} else {
-		lnthSuffix( str, type, ltype );
-	}
+		// At least one digit in integer constant, so safe to backup while looking for suffix.
+		string::size_type posn;
+		// pointer value
+		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 ) {
+			Unsigned = true; type = 2; ltype = 4; str.erase( posn, 1 );
+			// signed char
+		} 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 ) {
+			type = 1; str.erase( posn, 2 );
+			// short
+		} 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 ) {
+			type = 2; str.erase( posn, 1 );
+		} else if ( str.rfind( "ll" ) != string::npos || str.rfind( "LL" ) != string::npos ) {
+			type = 4;
+		} else {
+			lnthSuffix( str, type, ltype );
+		} // if
+	} // if
 
 	// Cannot be just "0"/"1"; sscanf stops at the suffix, if any; value goes over the wall => always generate
@@ -208,5 +210,5 @@
 					sscanf( (char *)str2.c_str(), "%llx", &v2 );
 					str = str.substr( 0, len - 16 );
-				}
+				} // if
 				sscanf( (char *)str.c_str(), "%llx", &v );
 #endif // __SIZEOF_INT128__
@@ -434,17 +436,17 @@
 	Type * strtype;
 	switch ( str[0] ) {									// str has >= 2 characters, i.e, null string "" => safe to look at subscripts 0/1
-	case 'u':
+	  case 'u':
 		if ( str[1] == '8' ) goto Default;				// utf-8 characters => array of char
 		// lookup type of associated typedef
 		strtype = new TypeInstType( Type::Qualifiers( ), "char16_t", false );
 		break;
-	case 'U':
+	  case 'U':
 		strtype = new TypeInstType( Type::Qualifiers( ), "char32_t", false );
 		break;
-	case 'L':
+	  case 'L':
 		strtype = new TypeInstType( Type::Qualifiers( ), "wchar_t", false );
 		break;
-	Default:											// char default string type
-	default:
+	  Default:											// char default string type
+	  default:
 		strtype = new BasicType( Type::Qualifiers( ), BasicType::Char );
 	} // switch
@@ -649,5 +651,3 @@
 // Local Variables: //
 // tab-width: 4 //
-// mode: c++ //
-// compile-command: "make install" //
 // End: //