Changes in / [262a864:80018f5]

Files:

• src/Parser/ExpressionNode.cpp (modified) (5 diffs)
• tests/.expect/attributes.x64.txt (modified) (1 diff)
• tests/attributes.cfa (modified) (2 diffs)

src/Parser/ExpressionNode.cpp

@@ -10 +10 @@
 // Created On       : Sat May 16 13:17:07 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Dec 16 20:50:27 2024
-// Update Count     : 1110
+// Last Modified On : Thu Sep 12 22:40:35 2024
+// Update Count     : 1090
 //
 
@@ -162 +162 @@
                 lnthSuffix( str, type, ltype );                                 // could have length suffix
         } 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.)
+                // 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
@@ -465 +465 @@
 }
 
-// A "sequence" is the series of characters in a character/string literal that becomes a single
-// character value in the runtime value.
+// A "sequence" is the series of characters in a character/string literal
+// that becomes a single character value in the runtime value.
 static size_t sequenceLength( const std::string & str, size_t pos ) {
         // Most "sequences" are just a single character, filter those out:
@@ -497 +497 @@
                 assertf( false, "Unknown escape sequence (start %c).", str[pos] );
                 return 1;
-        } // switch
+        }
 }
 
-ast::Expr * build_constantStr( const CodeLocation & location, string & str ) {
+ast::Expr * build_constantStr(
+                const CodeLocation & location,
+                string & str ) {
         assert( str.length() > 0 );
         string units;                                                                           // units
@@ -523 +525 @@
         } // switch
 
-        // The length value of the type is equal to the number of "sequences" not including the openning
-        // and closing quotes in the literal plus 1 for the implicit null terminator.
-        size_t length = 1;
-        for ( size_t pos = 1 ; pos < str.size() - 1 ; pos += sequenceLength( str, pos ) ) {
-                if ( '"' == str[pos] ) {                                                // concatenated strings ? "ABC" "DEF"
-                        int cnt = 1;                                                            // skip outside quotes and space between
-                        for ( unsigned int i = pos + 1; str[i] != '"'; i += 1, cnt += 1 );
-                        pos += cnt;
-                        continue;                                                                       // not part of length
-                } // if
-                length += 1;
-        } // for
+        // The dimension value of the type is equal to the number of "sequences"
+        // not including the openning and closing quotes in the literal plus 1
+        // for the implicit null terminator.
+        size_t dimension = 1;
+        for ( size_t pos = 1 ; pos < str.size() - 1 ;
+                        pos += sequenceLength( str, pos ) ) {
+                dimension += 1;
+        }
 
         ast::ArrayType * at = new ast::ArrayType(
                 strtype,
-                ast::ConstantExpr::from_ulong( location, length ),
+                ast::ConstantExpr::from_ulong( location, dimension ),
                 ast::FixedLen,
                 ast::DynamicDim );
         ast::Expr * ret = new ast::ConstantExpr( location, at, str, std::nullopt );
         if ( units.length() != 0 ) {
-                ret = new ast::UntypedExpr( location, new ast::NameExpr( location, units ),     { ret } );
+                ret = new ast::UntypedExpr( location,
+                        new ast::NameExpr( location, units ),
+                        { ret } );
         } // if
 

tests/.expect/attributes.x64.txt

@@ -1339 +1339 @@
 __attribute__ (( noreturn )) void _X4fredFv___1(void){
     __attribute__ ((unused)) signed int _X1ii_2;
-    __attribute__ ((gnu::xxx)) signed int _X1ji_2;
     switch ( 3 ) {
         case 2:

tests/attributes.cfa

@@ -10 +10 @@
 // Created On       : Mon Feb  6 16:07:02 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Dec 16 14:45:04 2024
-// Update Count     : 51
+// Last Modified On : Sun Dec 15 17:45:39 2024
+// Update Count     : 49
 // 
 
@@ -164 +164 @@
 [[ noreturn ]] void fred() {
         int [[unused]] i;
-        int [[gnu::xxx]] j;
         switch ( 3 ) {
           case 2: