Changeset 9082d7e8 for src/Parser/lex.ll


Ignore:
Timestamp:
Mar 30, 2023, 4:05:59 PM (2 years ago)
Author:
caparson <caparson@…>
Branches:
ADT, ast-experimental, master
Children:
bd72c284
Parents:
d24b1985 (diff), ff443e5 (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

    rd24b1985 r9082d7e8  
    1010 * Created On       : Sat Sep 22 08:58:10 2001
    1111 * Last Modified By : Peter A. Buhr
    12  * Last Modified On : Mon Jan 30 19:03:34 2023
    13  * Update Count     : 767
     12 * Last Modified On : Sat Mar 25 08:09:03 2023
     13 * Update Count     : 768
    1414 */
    1515
    … …  
    214214__alignof               { KEYWORD_RETURN(ALIGNOF); }                    // GCC
    215215__alignof__             { KEYWORD_RETURN(ALIGNOF); }                    // GCC
     216and                             { QKEYWORD_RETURN(WAND); }                              // CFA
    216217asm                             { KEYWORD_RETURN(ASM); }
    217218__asm                   { KEYWORD_RETURN(ASM); }                                // GCC
Note: See TracChangeset for help on using the changeset viewer.