Changeset 6395817 for src/Parser/lex.ll


Ignore:
Timestamp:
Oct 26, 2017, 12:17:52 PM (6 years ago)
Author:
Thierry Delisle <tdelisle@…>
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:
f54a0ab
Parents:
b7170a64 (diff), 15e4e22 (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:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/Parser/lex.ll

    rb7170a64 r6395817  
    1010 * Created On       : Sat Sep 22 08:58:10 2001
    1111 * Last Modified By : Peter A. Buhr
    12  * Last Modified On : Sat Sep 23 17:29:28 2017
    13  * Update Count     : 632
     12 * Last Modified On : Wed Oct 25 12:19:27 2017
     13 * Update Count     : 633
    1414 */
    1515
     
    233233__extension__   { KEYWORD_RETURN(EXTENSION); }                  // GCC
    234234extern                  { KEYWORD_RETURN(EXTERN); }
    235 fallthrough             { KEYWORD_RETURN(FALLTHRU); }                   // CFA
     235fallthrough             { KEYWORD_RETURN(FALLTHROUGH); }                // CFA
    236236fallthru                { KEYWORD_RETURN(FALLTHRU); }                   // CFA
    237237finally                 { KEYWORD_RETURN(FINALLY); }                    // CFA
Note: See TracChangeset for help on using the changeset viewer.