Changeset 6b224a52 for src/Parser/lex.ll


Ignore:
Timestamp:
Aug 25, 2017, 12:11:53 PM (7 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:
bf7b9da7
Parents:
135b431 (diff), f676b84 (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

    r135b431 r6b224a52  
    237237__label__               { KEYWORD_RETURN(LABEL); }                              // GCC
    238238long                    { KEYWORD_RETURN(LONG); }
    239 lvalue                  { KEYWORD_RETURN(LVALUE); }                             // CFA
    240239monitor                 { KEYWORD_RETURN(MONITOR); }                    // CFA
    241240mutex                   { KEYWORD_RETURN(MUTEX); }                              // CFA
Note: See TracChangeset for help on using the changeset viewer.