Changeset 481115f


Ignore:
Timestamp:
Nov 27, 2017, 10:01:56 PM (4 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
8eb348a
Parents:
c8771e9
Message:

change semantics of CFA routine-prototype declaration

Location:
src
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • src/Parser/ParseNode.h

    rc8771e9 r481115f  
    1010// Created On       : Sat May 16 13:28:16 2015
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Sat Sep 23 18:11:22 2017
    13 // Update Count     : 821
     12// Last Modified On : Mon Nov 27 17:33:35 2017
     13// Update Count     : 824
    1414//
    1515
     
    292292        DeclarationNode * set_extension( bool exten ) { extension = exten; return this; }
    293293  public:
     294        DeclarationNode * get_last() { return (DeclarationNode *)ParseNode::get_last(); }
     295
    294296        struct Variable_t {
    295297//              const std::string * name;
  • src/Parser/parser.yy

    rc8771e9 r481115f  
    1010// Created On       : Sat Sep  1 20:22:55 2001
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Sun Nov 26 11:36:36 2017
    13 // Update Count     : 2969
     12// Last Modified On : Mon Nov 27 17:23:35 2017
     13// Update Count     : 2992
    1414//
    1515
     
    13641364                        $$ = $3->addQualifiers( $1 )->addQualifiers( $2 );
    13651365                }
    1366         | cfa_function_declaration pop ',' push identifier_or_type_name
    1367                 {
    1368                         typedefTable.addToEnclosingScope( *$5, TypedefTable::ID );
    1369                         $$ = $1->appendList( $1->cloneType( $5 ) );
     1366        | cfa_function_declaration pop ',' push identifier_or_type_name '(' push cfa_parameter_type_list_opt pop ')'
     1367                {
     1368                        // Append the return type at the start (left-hand-side) to each identifier in the list.
     1369                        DeclarationNode * ret = new DeclarationNode;
     1370                        ret->type = maybeClone( $1->type->base );
     1371                        $$ = $1->appendList( DeclarationNode::newFunction( $5, ret, $8, nullptr, true ) );
    13701372                }
    13711373        ;
     
    24162418                        typedefTable.addToEnclosingScope( TypedefTable::ID );
    24172419                        typedefTable.leaveScope();
    2418                         $$ = $1->addFunctionBody( $3 );
     2420                        // Add the function body to the last identifier in the function definition list, i.e., foo3:
     2421                        //   [const double] foo1(), foo2( int ), foo3( double ) { return 3.0; }
     2422                        $1->get_last()->addFunctionBody( $3 );
     2423                        $$ = $1;
    24192424                }
    24202425        | declaration_specifier function_declarator with_clause_opt compound_statement
  • src/tests/Makefile.am

    rc8771e9 r481115f  
    1111## Created On       : Sun May 31 09:08:15 2015
    1212## Last Modified By : Peter A. Buhr
    13 ## Last Modified On : Tue Oct 10 14:04:40 2017
    14 ## Update Count     : 47
     13## Last Modified On : Mon Nov 27 21:34:33 2017
     14## Update Count     : 48
    1515###############################################################################
    1616
     
    118118        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
    119119
     120functions: functions.c @CFA_BINDIR@/@CFA_NAME@
     121        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
     122
    120123KRfunctions : KRfunctions.c @CFA_BINDIR@/@CFA_NAME@
    121124        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
  • src/tests/Makefile.in

    rc8771e9 r481115f  
    871871        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
    872872
     873functions: functions.c @CFA_BINDIR@/@CFA_NAME@
     874        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
     875
    873876KRfunctions : KRfunctions.c @CFA_BINDIR@/@CFA_NAME@
    874877        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
  • src/tests/functions.c

    rc8771e9 r481115f  
    1010// Created On       : Wed Aug 17 08:39:58 2016
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Wed Aug 17 08:40:52 2016
    13 // Update Count     : 1
     12// Last Modified On : Mon Nov 27 18:08:54 2017
     13// Update Count     : 11
    1414//
    1515
     
    6666// Cforall extensions
    6767
    68 [] f( );
     68// [] f( );
    6969[int] f( );
    70 [] f(int);
     70// [] f(int);
    7171[int] f(int);
    72 [] f( ) {}
     72// [] f( ) {}
    7373[int] f( ) {}
    74 [] f(int) {}
     74// [] f(int) {}
    7575[int] f(int) {}
    7676
    7777[int x] f( );
    78 [] f(int x);
    79 [int x] f(int x);
    80 [int x] f( ) {}
    81 [] f(int x) {}
    82 [int x] f(int x) {}
     78// [] f(int x);
     79//[int x] f(int x);
     80//[int x] f( ) {}
     81// [] f(int x) {}
     82//[int x] f(int x) {}
    8383
    8484[int, int x] f( );
    85 [] f(int, int x);
     85// [] f(int, int x);
    8686[int, int x] f(int, int x);
    8787[int, int x] f( ) {}
    88 [] f(int, int x) {}
     88// [] f(int, int x) {}
    8989[int, int x] f(int, int x) {}
    9090
    9191[int, int x, int] f( );
    92 [] f(int, int x, int);
     92// [] f(int, int x, int);
    9393[int, int x, int] f(int, int x, int);
    9494[int, int x, int] f( ) {}
    95 [] f(int, int x, int) {}
     95// [] f(int, int x, int) {}
    9696[int, int x, int] f(int, int x, int) {}
    9797
    9898[int, int x, * int y] f( );
    99 [] f(int, int x, * int y);
     99// [] f(int, int x, * int y);
    100100[int, int x, * int y] f(int, int x, * int y);
    101101[int, int x, * int y] f( ) {}
    102 [] f(int, int x, * int y) {}
     102// [] f(int, int x, * int y) {}
    103103[int, int x, * int y] f(int, int x, * int y) {}
    104104
    105 [ int ] f11( int ), f12;  // => int f11( int ), f12( int );
     105// function prototypes
     106
     107[ int ] f11( int ), f12();  // => int f11( int ), f12( void );
     108
     109const double bar1(), bar2( int ), bar3( double );               // C version
     110[const double] foo(), foo( int ), foo( double ) { return 3.0; } // CFA version
     111struct S { int i; };
     112[S] rtn( int ) {}
     113
    106114
    107115[int] f(
     
    109117        [int](int)
    110118        ) {
    111         int (*(*p)[][10])[][3];
     119        int (*(*pc)[][10])[][3];
    112120        * [][10] * [][3] int p;
    113121        * [] * [int](int) p;
Note: See TracChangeset for help on using the changeset viewer.