Changeset 3e91c6f9 for src/Parser

Timestamp:

Mar 13, 2025, 9:26:17 AM (8 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

8b639f9

Parents:

3bd9508 (diff), 594671a (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:

fix pull conflicit

Location:

src/Parser

Files:

• lex.ll (modified) (3 diffs)
• parser.yy (modified) (2 diffs)

src/Parser/lex.ll

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Fri Jan 17 14:36:16 2025
- * Update Count     : 878
+ * Last Modified On : Mon Mar  3 09:21:33 2025
+ * Update Count     : 880
  */
 
@@ -240 +240 @@
 basetypeof              { KEYWORD_RETURN(BASETYPEOF); }                 // CFA
 _Bool                   { KEYWORD_RETURN(BOOL); }                               // C99
-__SVBool_t              { KEYWORD_RETURN(SVBOOL); }                             // gcc (ARM)
+__SVBool_t              { KEYWORD_RETURN(BOOL); }                               // gcc (ARM)
 break                   { KEYWORD_RETURN(BREAK); }
 case                    { KEYWORD_RETURN(CASE); }
@@ -287 +287 @@
 _Float128               { FLOATXX(FLOAT128); }                                  // GCC
 _Float128x              { FLOATXX(FLOAT128X); }                                 // GCC
-__Float32x4_t   { FLOATXX(FLOAT32X4); }                                 // GCC (ARM)
-__Float64x2_t   { FLOATXX(FLOAT64X2); }                                 // GCC (ARM)
-__SVFloat32_t   { FLOATXX(SVFLOAT32); }                                 // GCC (ARM)
-__SVFloat64_t   { FLOATXX(SVFLOAT64); }                                 // GCC (ARM)
+__Float32x4_t   { FLOATXX(FLOAT128); }                                  // GCC (ARM)
+__Float64x2_t   { FLOATXX(FLOAT128); }                                  // GCC (ARM)
+__SVFloat32_t   { FLOATXX(FLOAT128); }                                  // GCC (ARM)
+__SVFloat64_t   { FLOATXX(FLOAT128); }                                  // GCC (ARM)
 for                             { KEYWORD_RETURN(FOR); }
 forall                  { KEYWORD_RETURN(FORALL); }                             // CFA

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Mar  3 20:47:00 2025
-// Update Count     : 7254
+// Last Modified On : Thu Mar 13 09:23:21 2025
+// Update Count     : 7255
 //
 
@@ -2244 +2244 @@
         basic_type_specifier
         | sue_type_specifier
-        | type_type_specifier
+        | type_type_specifier attribute_list_opt
         ;