Changeset 5fcba14

Timestamp:

Dec 4, 2017, 11:08:27 AM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

6d2f993

Parents:

497282e

Message:

Implement function declaration's with clause

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (1 diff)
• ParseNode.h (modified) (1 diff)
• parser.yy (modified) (10 diffs)

src/Parser/DeclarationNode.cc

@@ -717 +717 @@
 }
 
-DeclarationNode * DeclarationNode::addFunctionBody( StatementNode * body ) {
+DeclarationNode * DeclarationNode::addFunctionBody( StatementNode * body, StatementNode * with ) {
         assert( type );
         assert( type->kind == TypeData::Function );
         assert( ! type->function.body );
+        if ( with ) {
+                // convert
+                //  void f(S s) with (s) { x = 0; }
+                // to
+                //  void f(S s) { with(s) { x = 0; } }
+                WithStmt * withStmt = strict_dynamic_cast< WithStmt * >( with->build() );
+                withStmt->stmt = body->build();
+                delete body;
+                delete with;
+                body = new StatementNode( new CompoundStmt( { withStmt } ) );
+        }
         type->function.body = body;
         return this;

src/Parser/ParseNode.h

@@ -262 +262 @@
         DeclarationNode * addBitfield( ExpressionNode * size );
         DeclarationNode * addVarArgs();
-        DeclarationNode * addFunctionBody( StatementNode * body );
+        DeclarationNode * addFunctionBody( StatementNode * body, StatementNode * with = nullptr );
         DeclarationNode * addOldDeclList( DeclarationNode * list );
         DeclarationNode * setBase( TypeData * newType );

src/Parser/parser.yy

@@ -2412 +2412 @@
                 { $$ = nullptr; }
         | WITH '(' tuple_expression_list ')'
-                { throw SemanticError("With clause is currently unimplemented."); $$ = nullptr; } // FIX ME
+                { $$ = new StatementNode( build_with( $3, nullptr ) ); }
         ;
 
@@ -2422 +2422 @@
                         // Add the function body to the last identifier in the function definition list, i.e., foo3:
                         //   [const double] foo1(), foo2( int ), foo3( double ) { return 3.0; }
-                        $1->get_last()->addFunctionBody( $3 );
+                        $1->get_last()->addFunctionBody( $3, $2 );
                         $$ = $1;
                 }
@@ -2430 +2430 @@
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
-                        $$ = $2->addFunctionBody( $4 )->addType( $1 );
+                        $$ = $2->addFunctionBody( $4, $3 )->addType( $1 );
                 }
                 // handles default int return type, OBSOLESCENT (see 1)
@@ -2437 +2437 @@
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
-                        $$ = $2->addFunctionBody( $4 )->addQualifiers( $1 );
+                        $$ = $2->addFunctionBody( $4, $3 )->addQualifiers( $1 );
                 }
                 // handles default int return type, OBSOLESCENT (see 1)
@@ -2444 +2444 @@
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
-                        $$ = $2->addFunctionBody( $4 )->addQualifiers( $1 );
+                        $$ = $2->addFunctionBody( $4, $3 )->addQualifiers( $1 );
                 }
                 // handles default int return type, OBSOLESCENT (see 1)
@@ -2451 +2451 @@
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
-                        $$ = $3->addFunctionBody( $5 )->addQualifiers( $2 )->addQualifiers( $1 );
+                        $$ = $3->addFunctionBody( $5, $4 )->addQualifiers( $2 )->addQualifiers( $1 );
                 }
 
@@ -2460 +2460 @@
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
-                        $$ = $2->addOldDeclList( $3 )->addFunctionBody( $5 )->addType( $1 );
+                        $$ = $2->addOldDeclList( $3 )->addFunctionBody( $5, $4 )->addType( $1 );
                 }
                 // handles default int return type, OBSOLESCENT (see 1)
@@ -2467 +2467 @@
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
-                        $$ = $2->addOldDeclList( $3 )->addFunctionBody( $5 )->addQualifiers( $1 );
+                        $$ = $2->addOldDeclList( $3 )->addFunctionBody( $5, $4 )->addQualifiers( $1 );
                 }
                 // handles default int return type, OBSOLESCENT (see 1)
@@ -2474 +2474 @@
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
-                        $$ = $2->addOldDeclList( $3 )->addFunctionBody( $5 )->addQualifiers( $1 );
+                        $$ = $2->addOldDeclList( $3 )->addFunctionBody( $5, $4 )->addQualifiers( $1 );
                 }
                 // handles default int return type, OBSOLESCENT (see 1)
@@ -2481 +2481 @@
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
-                        $$ = $3->addOldDeclList( $4 )->addFunctionBody( $6 )->addQualifiers( $2 )->addQualifiers( $1 );
+                        $$ = $3->addOldDeclList( $4 )->addFunctionBody( $6, $5 )->addQualifiers( $2 )->addQualifiers( $1 );
                 }
         ;