Changeset d63eeb0 for src/Parser/lex.ll

Timestamp:

Feb 9, 2016, 3:25:05 PM (10 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

7528ba1

Parents:

771b3c3 (diff), bd85400 (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 ctor

Conflicts:

src/CodeGen/CodeGenerator.cc
src/GenPoly/Box.cc
src/Makefile.in
src/Parser/ParseNode.h
src/Parser/parser.cc
src/Parser/parser.yy
src/SymTab/Validate.cc
src/SynTree/Initializer.h
src/SynTree/ObjectDecl.cc
src/SynTree/Visitor.h
src/main.cc

File:

• src/Parser/lex.ll (modified) (3 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 : Thu Oct  8 16:13:07 2015
- * Update Count     : 404
+ * Last Modified On : Tue Feb  2 15:06:54 2016
+ * Update Count     : 426
  */
 
@@ -95 +95 @@
 fractional_constant ({decimal_digits}?"."{decimal_digits})|({decimal_digits}".")
 exponent "_"?[eE]"_"?[+-]?{decimal_digits}
-floating_suffix "_"?[flFL]
+                                // GCC: D (double), LD (long double) and iI (imaginary) suffixes
+floating_suffix "_"?([fFdD]?|([lL]?)|([iI][lLfFdD]?)|([lLfFdD][iI]))
 floating_constant (({fractional_constant}{exponent}?)|({decimal_digits}{exponent})){floating_suffix}?
 
@@ -235 +236 @@
 lvalue                  { KEYWORD_RETURN(LVALUE); }                             // CFA
 _Noreturn               { KEYWORD_RETURN(NORETURN); }                   // C11
+__builtin_offsetof { KEYWORD_RETURN(OFFSETOF); }                // GCC
 register                { KEYWORD_RETURN(REGISTER); }
 restrict                { KEYWORD_RETURN(RESTRICT); }                   // C99