Changeset 7f6a7c9 for src/Parser/lex.ll

Timestamp:

Sep 21, 2022, 11:02:15 AM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

95dab9e

Parents:

428adbc (diff), 0bd46fd (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:

Merge branch 'master' into pthread-emulation

File:

• src/Parser/lex.ll (modified) (4 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 : Sun Jun 20 18:41:09 2021
- * Update Count     : 759
+ * Last Modified On : Tue Sep 20 21:18:55 2022
+ * Update Count     : 762
  */
 
@@ -24 +24 @@
 
 //**************************** Includes and Defines ****************************
+
+#ifdef __clang__
+#pragma GCC diagnostic ignored "-Wnull-conversion"
+#endif
 
 // trigger before each matching rule's action
@@ -82 +86 @@
 // Stop warning due to incorrectly generated flex code.
 #pragma GCC diagnostic ignored "-Wsign-compare"
-
-// lex uses __null in a boolean context, it's fine.
-#pragma GCC diagnostic ignored "-Wnull-conversion"
 %}
 
@@ -314 +315 @@
 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