Changeset 0d0931d

Timestamp:

Mar 14, 2023, 12:56:41 PM (14 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master

Children:

c19ca4b

Parents:

a96ce07

Message:

Removing some indent changes in parser. These can go in later, but hopefully this will avoid conflicts with the translation.

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (11 diffs)
• ExpressionNode.cc (modified) (4 diffs)

src/Parser/DeclarationNode.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 12:34:05 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 14 08:54:13 2023
-// Update Count     : 1405
+// Last Modified By : Andrew Beach
+// Last Modified On : Tue Mar 14 11:56:00 2023
+// Update Count     : 1406
 //
 
@@ -600 +600 @@
         } 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 +633 @@
                         } // 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 +645 @@
                                 src = nullptr;
                                 break;
-                          default:
+                        default:
                                 if ( dst->forall ) {
                                         dst->forall->appendList( src->forall );
@@ -727 +727 @@
         assert( type );
         switch ( type->kind ) {
-          case TypeData::Symbolic:
+        case TypeData::Symbolic:
                 if ( type->symbolic.assertions ) {
                         type->symbolic.assertions->appendList( assertions );
@@ -734 +734 @@
                 } // if
                 break;
-          default:
+        default:
                 assert( false );
         } // switch
@@ -833 +833 @@
                 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 +843 @@
                                 break;
 
-                          default:
+                        default:
                                 p->type->base = type;
                         } // switch
@@ -865 +865 @@
 
 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 +879 @@
                         lastArray->base->qualifiers |= type->qualifiers;
                         break;
-                  default:
+                default:
                         lastArray->base = type;
                 } // switch
@@ -1245 +1245 @@
 
         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

src/Parser/ExpressionNode.cc

@@ -9 +9 @@
 // Author           : Peter A. Buhr
 // Created On       : Sat May 16 13:17:07 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 14 09:10:22 2023
-// Update Count     : 1081
+// Last Modified By : Andrew Beach
+// Last Modified On : Tue Mar 14 12:00:00 2023
+// Update Count     : 1082
 //
 
@@ -122 +122 @@
                 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
@@ -168 +168 @@
                 if ( posn = str.find_last_of( "pP" ); posn != string::npos ) {
                         ltype = 5; str.erase( posn, 1 );
-                        // size_t
+                // 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
+                // signed char
                 } else if ( posn = str.rfind( "hh" ); posn != string::npos ) {
                         type = 1; str.erase( posn, 2 );
-                        // signed char
+                // signed char
                 } else if ( posn = str.rfind( "HH" ); posn != string::npos ) {
                         type = 1; str.erase( posn, 2 );
-                        // short
+                // short
                 } else if ( posn = str.find_last_of( "hH" ); posn != string::npos ) {
                         type = 0; str.erase( posn, 1 );
-                        // int (natural number)
+                // int (natural number)
                 } else if ( posn = str.find_last_of( "nN" ); posn != string::npos ) {
                         type = 2; str.erase( posn, 1 );
@@ -436 +436 @@
         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