Changeset 566b74f for src/Parser/TypeData.cc

Timestamp:

Feb 23, 2018, 11:38:29 AM (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:

2c39855

Parents:

d8548e2 (diff), 0304215a (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:

• src/Parser/TypeData.cc (modified) (4 diffs)

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Sep 25 18:33:41 2017
-// Update Count     : 587
+// Last Modified On : Thu Feb 22 15:49:00 2018
+// Update Count     : 597
 //
 
@@ -54 +54 @@
                 function.oldDeclList = nullptr;
                 function.body = nullptr;
-                function.newStyle = false;
                 function.withExprs = nullptr;
                 break;
@@ -195 +194 @@
                 newtype->function.oldDeclList = maybeClone( function.oldDeclList );
                 newtype->function.body = maybeClone( function.body );
-                newtype->function.newStyle = function.newStyle;
                 newtype->function.withExprs = maybeClone( function.withExprs );
                 break;
@@ -881 +879 @@
 FunctionType * buildFunction( const TypeData * td ) {
         assert( td->kind == TypeData::Function );
-        bool hasEllipsis = td->function.params ? td->function.params->get_hasEllipsis() : true;
-        if ( ! td->function.params ) hasEllipsis = ! td->function.newStyle;
-        FunctionType * ft = new FunctionType( buildQualifiers( td ), hasEllipsis );
+        FunctionType * ft = new FunctionType( buildQualifiers( td ), ! td->function.params || td->function.params->hasEllipsis );
         buildList( td->function.params, ft->get_parameters() );
         buildForall( td->forall, ft->get_forall() );