Changeset 23a08aa0 for src/Parser

Timestamp:

Sep 19, 2022, 8:11:02 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

aa9f215

Parents:

ebf8ca5 (diff), ae1d151 (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 merge conflict

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (2 diffs)
• lex.ll (modified) (2 diffs)
• parser.yy (modified) (5 diffs)

src/Parser/DeclarationNode.cc

@@ -262 +262 @@
         newnode->type->enumeration.anon = name == nullptr;
         if ( base && base->type)  {
-                newnode->type->base = base->type;       
+                newnode->type->base = base->type;
         } // if
 
@@ -505 +505 @@
                         } // for
                         // src is the new item being added and has a single bit
-                } else if ( ! src->storageClasses.is_threadlocal ) { // conflict ?
+                } else if ( ! src->storageClasses.is_threadlocal_any() ) { // conflict ?
                         appendError( error, string( "conflicting " ) + Type::StorageClassesNames[storageClasses.ffs()] +
                                                  " & " + Type::StorageClassesNames[src->storageClasses.ffs()] );

src/Parser/lex.ll

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Sun Jun 20 18:41:09 2021
- * Update Count     : 759
+ * Last Modified On : Tue Aug 30 18:39:54 2022
+ * Update Count     : 760
  */
 
@@ -314 +314 @@
 switch                  { KEYWORD_RETURN(SWITCH); }
 thread                  { KEYWORD_RETURN(THREAD); }                             // C11
-_Thread_local   { KEYWORD_RETURN(THREADLOCAL); }                // C11
+__thread                { KEYWORD_RETURN(THREADLOCALGCC); }             // GCC
+_Thread_local   { KEYWORD_RETURN(THREADLOCALC11); }             // C11
 throw                   { KEYWORD_RETURN(THROW); }                              // CFA
 throwResume             { KEYWORD_RETURN(THROWRESUME); }                // CFA

src/Parser/parser.yy

@@ -58 +58 @@
 
 // lex uses __null in a boolean context, it's fine.
-//#pragma GCC diagnostic ignored "-Wparentheses-equality"
+#pragma GCC diagnostic ignored "-Wpragmas"
+#pragma GCC diagnostic ignored "-Wparentheses-equality"
+#pragma GCC diagnostic warning "-Wpragmas"
 
 extern DeclarationNode * parseTree;
@@ -293 +295 @@
 %token TYPEDEF
 %token EXTERN STATIC AUTO REGISTER
-%token THREADLOCAL                                                                              // C11
+%token THREADLOCALGCC THREADLOCALC11                                            // GCC, C11
 %token INLINE FORTRAN                                                                   // C99, extension ISO/IEC 9899:1999 Section J.5.9(1)
 %token NORETURN                                                                                 // C11
@@ -1345 +1347 @@
                 {
                         if ( $2 == OperKinds::LThan || $2 == OperKinds::LEThan ) { SemanticError( yylloc, MISSING_ANON_FIELD ); $$ = nullptr; }
-                        else { SemanticError( yylloc, MISSING_HIGH ); $$ = nullptr; } 
+                        else { SemanticError( yylloc, MISSING_HIGH ); $$ = nullptr; }
                 }
         | comma_expression updowneq comma_expression '~' comma_expression // CFA, anonymous loop-index
@@ -1357 +1359 @@
                 {
                         if ( $2 == OperKinds::LThan || $2 == OperKinds::LEThan ) { SemanticError( yylloc, MISSING_ANON_FIELD ); $$ = nullptr; }
-                        else { SemanticError( yylloc, MISSING_HIGH ); $$ = nullptr; } 
+                        else { SemanticError( yylloc, MISSING_HIGH ); $$ = nullptr; }
                 }
         | comma_expression updowneq comma_expression '~' '@' // CFA, error
@@ -2082 +2084 @@
         | REGISTER
                 { $$ = DeclarationNode::newStorageClass( Type::Register ); }
-        | THREADLOCAL                                                                           // C11
-                { $$ = DeclarationNode::newStorageClass( Type::Threadlocal ); }
+        | THREADLOCALGCC                                                                                // GCC
+                { $$ = DeclarationNode::newStorageClass( Type::ThreadlocalGcc ); }
+        | THREADLOCALC11                                                                                // C11
+                { $$ = DeclarationNode::newStorageClass( Type::ThreadlocalC11 ); }
                 // Put function specifiers here to simplify parsing rules, but separate them semantically.
         | INLINE                                                                                        // C99