Changeset 75bd041


Ignore:
Timestamp:
Apr 1, 2023, 3:57:20 PM (19 months ago)
Author:
caparsons <caparson@…>
Branches:
ADT, ast-experimental, master
Children:
3c17a10, 678c540
Parents:
3d08cea (diff), f3ba69d (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

Files:
32 added
1 edited

Legend:

Unmodified
Added
Removed

  • src/Parser/parser.yy

    r3d08cea r75bd041  
    1010// Created On       : Sat Sep  1 20:22:55 2001
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Wed Mar 29 17:56:42 2023
    13 // Update Count     : 6325
     12// Last Modified On : Thu Mar 30 21:28:25 2023
     13// Update Count     : 6328
    1414//
    1515
    … …  
    16511651                // Called first: create header for WaitForStmt.
    16521652                { $$ = build_waitfor( new WaitForStmt(), $1, $2, maybe_build_compound( $3 ) ); }
    1653         | wor_waitfor_clause wor when_clause_opt waitfor statement      %prec THEN
     1653        | wor_waitfor_clause wor when_clause_opt waitfor statement
    16541654                { $$ = build_waitfor( $1, $3, $4, maybe_build_compound( $5 ) ); }
    16551655        | wor_waitfor_clause wor when_clause_opt ELSE statement
    … …  
    16951695        wand_waituntil_clause
    16961696                { printf( "wor_waituntil_clause 1\n" ); $$ = nullptr; }
    1697         | wor_waituntil_clause wor wor_waituntil_clause         %prec THEN
     1697        | wor_waituntil_clause wor wand_waituntil_clause
    16981698                { printf( "wor_waituntil_clause 2\n" ); $$ = nullptr; }
    16991699        | wor_waituntil_clause wor when_clause_opt ELSE statement
Note: See TracChangeset for help on using the changeset viewer.