Changeset a9b657a for src/Parser/lex.ll


Ignore:
Timestamp:
Mar 10, 2017, 11:01:31 AM (7 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
Children:
dc0557d
Parents:
c857ad3 (diff), 149d297 (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' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/Parser/lex.ll

    rc857ad3 ra9b657a  
    1010 * Created On       : Sat Sep 22 08:58:10 2001
    1111 * Last Modified By : Peter A. Buhr
    12  * Last Modified On : Fri Mar  3 22:18:00 2017
    13  * Update Count     : 502
     12 * Last Modified On : Thu Mar  9 21:38:26 2017
     13 * Update Count     : 505
    1414 */
    1515
    … …  
    202202__const__               { KEYWORD_RETURN(CONST); }                              // GCC
    203203continue                { KEYWORD_RETURN(CONTINUE); }
     204_Coroutine              { KEYWORD_RETURN(COROUTINE); }                  // CFA
    204205default                 { KEYWORD_RETURN(DEFAULT); }
    205206disable                 { KEYWORD_RETURN(DISABLE); }                    // CFA
    … …  
    235236long                    { KEYWORD_RETURN(LONG); }
    236237lvalue                  { KEYWORD_RETURN(LVALUE); }                             // CFA
     238_Monitor                { KEYWORD_RETURN(MONITOR); }                    // CFA
    237239mutex                   { KEYWORD_RETURN(MUTEX); }                              // CFA
    238240_Noreturn               { KEYWORD_RETURN(NORETURN); }                   // C11
    … …  
    254256struct                  { KEYWORD_RETURN(STRUCT); }
    255257switch                  { KEYWORD_RETURN(SWITCH); }
     258_Thread                 { KEYWORD_RETURN(THREAD); }                             // C11
    256259_Thread_local   { KEYWORD_RETURN(THREADLOCAL); }                // C11
    257260throw                   { KEYWORD_RETURN(THROW); }                              // CFA
Note: See TracChangeset for help on using the changeset viewer.