Changeset 84993ff2 for src

Timestamp:

Aug 15, 2017, 11:09:40 AM (8 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:

08fc48f

Parents:

c3acf0aa (diff), 6a36975 (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

Location:

src

Files:

• ControlStruct/MLEMutator.cc (modified) (2 diffs)
• Parser/TypeData.cc (modified) (5 diffs)
• Parser/TypeData.h (modified) (2 diffs)
• ResolvExpr/Resolver.cc (modified) (1 diff)
• SynTree/Declaration.h (modified) (2 diffs)
• SynTree/Statement.cc (modified) (5 diffs)
• tests/.expect/32/math1.txt (added)
• tests/.expect/32/math2.txt (moved) (moved from src/tests/.expect/32/math.txt ) (3 diffs)
• tests/.expect/32/math3.txt (added)
• tests/.expect/64/math1.txt (added)
• tests/.expect/64/math2.txt (moved) (moved from src/tests/.expect/64/math.txt ) (3 diffs)
• tests/.expect/64/math3.txt (added)
• tests/except-2.c (modified) (4 diffs)
• tests/math.c (deleted)
• tests/math1.c (added)
• tests/math2.c (added)
• tests/math3.c (added)

src/ControlStruct/MLEMutator.cc

@@ -154 +154 @@
                 return switchStmt;
         }
+
+        void addUnused( Statement * stmt, const Label & originalTarget ) {
+                // break/continue without a label doesn't need unused attribute
+                if ( originalTarget == "" ) return;
+                // add unused attribute to the originalTarget of a labelled break/continue
+                for ( Label & l : stmt->get_labels() ) {
+                        // find the label to add unused attribute to
+                        if ( l == originalTarget ) {
+                                for ( Attribute * attr : l.get_attributes() ) {
+                                        // ensure attribute isn't added twice
+                                        if ( attr->get_name() == "unused" ) return;
+                                }
+                                l.get_attributes().push_back( new Attribute( "unused" ) );
+                                return;
+                        }
+                }
+                assertf( false, "Could not find label '%s' on statement %s", originalTarget.get_name().c_str(), toString( stmt ).c_str() );
+        }
+
 
         Statement *MLEMutator::mutate( BranchStmt *branchStmt ) throw ( SemanticError ) {
@@ -204 +223 @@
                 } // switch
 
+                // add unused attribute to label to silence warnings
+                addUnused( targetEntry->get_controlStructure(), branchStmt->get_originalTarget() );
+
                 // transform break/continue statements into goto to simplify later handling of branches
                 delete branchStmt;

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Aug 11 10:50:00 2017
-// Update Count     : 567
+// Last Modified On : Mon Aug 14 10:41:00 2017
+// Update Count     : 568
 //
 
@@ -628 +628 @@
                 break;
           case DeclarationNode::Union:
-                at = new UnionDecl( *td->aggregate.name, attributes );
+                at = new UnionDecl( *td->aggregate.name, attributes, linkage );
                 buildForall( td->aggregate.params, at->get_parameters() );
                 break;
           case DeclarationNode::Trait:
-                at = new TraitDecl( *td->aggregate.name, attributes );
+                at = new TraitDecl( *td->aggregate.name, attributes, linkage );
                 buildList( td->aggregate.params, at->get_parameters() );
                 break;
@@ -649 +649 @@
           case TypeData::Enum: {
                   if ( type->enumeration.body ) {
-                          EnumDecl * typedecl = buildEnum( type, attributes );
+                          EnumDecl * typedecl = buildEnum( type, attributes, linkage );
                           return new EnumInstType( buildQualifiers( type ), typedecl );
                   } else {
@@ -754 +754 @@
 } // buildSymbolic
 
-EnumDecl * buildEnum( const TypeData * td, std::list< Attribute * > attributes ) {
+EnumDecl * buildEnum( const TypeData * td, std::list< Attribute * > attributes, LinkageSpec::Spec linkage ) {
         assert( td->kind == TypeData::Enum );
-        EnumDecl * ret = new EnumDecl( *td->enumeration.name, attributes );
+        EnumDecl * ret = new EnumDecl( *td->enumeration.name, attributes, linkage );
         buildList( td->enumeration.constants, ret->get_members() );
         list< Declaration * >::iterator members = ret->get_members().begin();
@@ -807 +807 @@
                 return buildAggregate( td, attributes, linkage );
         } else if ( td->kind == TypeData::Enum ) {
-                return buildEnum( td, attributes );
+                return buildEnum( td, attributes, linkage );
         } else if ( td->kind == TypeData::Symbolic ) {
                 return buildSymbolic( td, name, scs, linkage );

src/Parser/TypeData.h

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 15:18:36 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:32:47 2017
-// Update Count     : 188
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Aug 14 10:38:00 2017
+// Update Count     : 189
 //
 
@@ -107 +107 @@
 ReferenceToType * buildAggInst( const TypeData * );
 TypeDecl * buildVariable( const TypeData * );
-EnumDecl * buildEnum( const TypeData *, std::list< Attribute * > );
+EnumDecl * buildEnum( const TypeData *, std::list< Attribute * >, LinkageSpec::Spec );
 TypeInstType * buildSymbolicInst( const TypeData * );
 TupleType * buildTuple( const TypeData * );

src/ResolvExpr/Resolver.cc

@@ -390 +390 @@
 
         void Resolver::visit( CatchStmt *catchStmt ) {
+                Parent::visit( catchStmt );
+                
                 if ( catchStmt->get_cond() ) {
                         Expression * wrapped = new CastExpr(

src/SynTree/Declaration.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Aug 11 10:20:00 2017
-// Update Count     : 127
+// Last Modified On : Mon Aug 14 10:15:00 2017
+// Update Count     : 128
 //
 
@@ -313 +313 @@
         typedef AggregateDecl Parent;
   public:
-        TraitDecl( const std::string &name, const std::list< Attribute * > & attributes ) : Parent( name ) {
+        TraitDecl( const std::string &name, const std::list< Attribute * > & attributes, LinkageSpec::Spec linkage ) : Parent( name, attributes, linkage ) {
                 assertf( attributes.empty(), "attribute unsupported for traits" );
         }

src/SynTree/Statement.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Jun 12 10:37:00 2017
-// Update Count     : 64
+// Last Modified On : Mon Aug 14 12:26:00 2017
+// Update Count     : 65
 //
 
@@ -329 +329 @@
 void TryStmt::print( std::ostream &os, int indent ) const {
         os << "Try Statement" << endl;
-        os << string( indent + 2, ' ' ) << "with block: " << endl;
+        os << string( indent + 2, ' ' ) << "with block:" << endl;
+        os << string( indent + 4, ' ' );
         block->print( os, indent + 4 );
 
         // handlers
-        os << string( indent + 2, ' ' ) << "and handlers: " << endl;
-        for ( std::list<CatchStmt *>::const_iterator i = handlers.begin(); i != handlers.end(); i++)
+        os << string( indent + 2, ' ' ) << "and handlers:" << endl;
+        for ( std::list<CatchStmt *>::const_iterator i = handlers.begin(); i != handlers.end(); i++) {
+                os << string( indent + 4, ' ' );
                 (*i )->print( os, indent + 4 );
+        }
 
         // finally block
         if ( finallyBlock != 0 ) {
-                os << string( indent + 2, ' ' ) << "Finally block: " << endl;
+                os << string( indent + 2, ' ' ) << "and finally:" << endl;
                 finallyBlock->print( os, indent + 4 );
         } // if
@@ -360 +363 @@
         os << "Catch " << ((Terminate == kind) ? "Terminate" : "Resume") << " Statement" << endl;
 
-        os << string( indent, ' ' ) << "... catching" << endl;
+        os << string( indent + 2, ' ' ) << "... catching: ";
         if ( decl ) {
                 decl->printShort( os, indent + 4 );
@@ -367 +370 @@
         else
                 os << string( indent + 4 , ' ' ) << ">>> Error:  this catch clause must have a declaration <<<" << endl;
+
+        if ( cond ) {
+                os << string( indent + 2, ' ' ) << "with conditional:" << endl;
+                os << string( indent + 4, ' ' );
+                cond->print( os, indent + 4 );
+        }
+        else
+                os << string( indent + 2, ' ' ) << "with no conditional" << endl;
+
+        os << string( indent + 2, ' ' ) << "with block:" << endl;
+        os << string( indent + 4, ' ' );
+        body->print( os, indent + 4 );
 }
 
@@ -383 +398 @@
 void FinallyStmt::print( std::ostream &os, int indent ) const {
         os << "Finally Statement" << endl;
-        os << string( indent + 2, ' ' ) << "with block: " << endl;
+        os << string( indent + 2, ' ' ) << "with block:" << endl;
+        os << string( indent + 4, ' ' );
         block->print( os, indent + 4 );
 }

src/tests/.expect/32/math2.txt

@@ -1 @@
-fmod:1 1 1 1 1 1
-remainder:-1 -1 -1
-remquo:7 0.0999999 7 0.1 7 0.0999999999999999999
-div:7, 0.2 7, 0.2 7, 0.2
-fma:-2 -2 -2
-fdim:2 2 2
-nan:nan nan nan
-exp:2.71828 2.71828182845905 2.71828182845904524 1.46869+2.28736i 1.46869393991589+2.28735528717884i 1.46869393991588516+2.28735528717884239i
-exp2:2 2 2
-expm1:1.71828 1.71828182845905 1.71828182845904524
-pow:1 1 1 0.273957+0.583701i 0.273957253830121+0.583700758758615i 0.273957253830121071+0.583700758758614628i
-16 256
-912673 256 64 -64 0.015625 -0.015625 18.3791736799526 0.264715-1.1922i
-log:0 0 0 0.346574+0.785398i 0.346573590279973+0.785398163397448i 0.346573590279972655+0.78539816339744831i
-log2:3 3 3
-log10:2 2 2
-log1p:0.693147 0.693147180559945 0.693147180559945309
-ilogb:0 0 0
-logb:3 3 3
-sqrt:1 1 1 1.09868+0.45509i 1.09868411346781+0.455089860562227i 1.09868411346780997+0.455089860562227341i
-cbrt:3 3 3
-hypot:1.41421 1.4142135623731 1.41421356237309505
 sin:0.841471 0.841470984807897 0.841470984807896507 1.29846+0.634964i 1.29845758141598+0.634963914784736i 1.29845758141597729+0.634963914784736108i
 cos:0.540302 0.54030230586814 0.540302305868139717 0.83373-0.988898i 0.833730025131149-0.988897705762865i 0.833730025131149049-0.988897705762865096i
@@ -27 +5 @@
 acos:0 0 0 0.904557-1.06128i 0.904556894302381-1.06127506190504i 0.904556894302381364-1.06127506190503565i
 atan:0.785398 0.785398163397448 0.78539816339744831 1.01722+0.402359i 1.01722196789785+0.402359478108525i 1.01722196789785137+0.402359478108525094i
-atan2:0.785398 0.785398163397448 0.78539816339744831 atan:0.785398 0.785398163397448 0.78539816339744831 sinh:1.1752 1.1752011936438 1.17520119364380146 0.634964+1.29846i 0.634963914784736+1.29845758141598i 0.634963914784736108+1.29845758141597729i
+atan2:0.785398 0.785398163397448 0.78539816339744831 atan:0.785398 0.785398163397448 0.78539816339744831
+sinh:1.1752 1.1752011936438 1.17520119364380146 0.634964+1.29846i 0.634963914784736+1.29845758141598i 0.634963914784736108+1.29845758141597729i
 cosh:1.54308 1.54308063481524 1.54308063481524378 0.83373+0.988898i 0.833730025131149+0.988897705762865i 0.833730025131149049+0.988897705762865096i
 tanh:0.761594 0.761594155955765 0.761594155955764888 1.08392+0.271753i 1.08392332733869+0.271752585319512i 1.08392332733869454+0.271752585319511717i
@@ -38 +17 @@
 lgamma:1.79176 1 1.79175946922805 1 1.791759469228055 1
 tgamma:6 6 6
-floor:1 1 1
-ceil:2 2 2
-trunc:3 3 3
-rint:2 2 2
-rint:2 2 2
-rint:2 2 2
-lrint:2 2 2
-llrint:2 2 2
-nearbyint:4 4 4
-round:2 2 2
-round:2 2 2
-round:2 2 2
-lround:2 2 2
-llround:2 2 2
-copysign:-1 -1 -1
-frexp:0.5 3 0.5 3 0.5 3
-ldexp:8 8 8
-modf:2 0.3 2 0.3 2 0.3
-modf:2, 0.3 2, 0.3 2, 0.3
-nextafter:2 2 2
-nexttoward:2 2 2
-scalbn:16 16 16
-scalbln:16 16 16

src/tests/.expect/64/math2.txt

@@ -1 @@
-fmod:1 1 1 1 1 1
-remainder:-1 -1 -1
-remquo:7 0.0999999 7 0.1 7 0.0999999999999999999
-div:7, 0.2 7, 0.2 7, 0.2
-fma:-2 -2 -2
-fdim:2 2 2
-nan:nan nan nan
-exp:2.71828 2.71828182845905 2.71828182845904524 1.46869+2.28736i 1.46869393991589+2.28735528717884i 1.46869393991588516+2.28735528717884239i
-exp2:2 2 2
-expm1:1.71828 1.71828182845905 1.71828182845904524
-pow:1 1 1 0.273957+0.583701i 0.273957253830121+0.583700758758615i 0.273957253830121071+0.583700758758614627i
-16 256
-912673 256 64 -64 0.015625 -0.015625 18.3791736799526 0.264715-1.1922i
-log:0 0 0 0.346574+0.785398i 0.346573590279973+0.785398163397448i 0.346573590279972655+0.78539816339744831i
-log2:3 3 3
-log10:2 2 2
-log1p:0.693147 0.693147180559945 0.693147180559945309
-ilogb:0 0 0
-logb:3 3 3
-sqrt:1 1 1 1.09868+0.45509i 1.09868411346781+0.455089860562227i 1.09868411346780997+0.455089860562227341i
-cbrt:3 3 3
-hypot:1.41421 1.4142135623731 1.41421356237309505
 sin:0.841471 0.841470984807897 0.841470984807896507 1.29846+0.634964i 1.29845758141598+0.634963914784736i 1.29845758141597729+0.634963914784736108i
 cos:0.540302 0.54030230586814 0.540302305868139717 0.83373-0.988898i 0.833730025131149-0.988897705762865i 0.833730025131149049-0.988897705762865096i
@@ -27 +5 @@
 acos:0 0 0 0.904557-1.06128i 0.904556894302381-1.06127506190504i 0.904556894302381364-1.06127506190503565i
 atan:0.785398 0.785398163397448 0.78539816339744831 1.01722+0.402359i 1.01722196789785+0.402359478108525i 1.01722196789785137+0.402359478108525094i
-atan2:0.785398 0.785398163397448 0.78539816339744831 atan:0.785398 0.785398163397448 0.78539816339744831 sinh:1.1752 1.1752011936438 1.17520119364380146 0.634964+1.29846i 0.634963914784736+1.29845758141598i 0.634963914784736108+1.29845758141597729i
+atan2:0.785398 0.785398163397448 0.78539816339744831 atan:0.785398 0.785398163397448 0.78539816339744831
+sinh:1.1752 1.1752011936438 1.17520119364380146 0.634964+1.29846i 0.634963914784736+1.29845758141598i 0.634963914784736108+1.29845758141597729i
 cosh:1.54308 1.54308063481524 1.54308063481524378 0.83373+0.988898i 0.833730025131149+0.988897705762865i 0.833730025131149049+0.988897705762865096i
 tanh:0.761594 0.761594155955765 0.761594155955764888 1.08392+0.271753i 1.08392332733869+0.271752585319512i 1.08392332733869454+0.271752585319511717i
@@ -38 +17 @@
 lgamma:1.79176 1 1.79175946922805 1 1.791759469228055 1
 tgamma:6 6 6
-floor:1 1 1
-ceil:2 2 2
-trunc:3 3 3
-rint:2 2 2
-rint:2 2 2
-rint:2 2 2
-lrint:2 2 2
-llrint:2 2 2
-nearbyint:4 4 4
-round:2 2 2
-round:2 2 2
-round:2 2 2
-lround:2 2 2
-llround:2 2 2
-copysign:-1 -1 -1
-frexp:0.5 3 0.5 3 0.5 3
-ldexp:8 8 8
-modf:2 0.3 2 0.3 2 0.3
-modf:2, 0.3 2, 0.3 2, 0.3
-nextafter:2 2 2
-nexttoward:2 2 2
-scalbn:16 16 16
-scalbln:16 16 16

src/tests/except-2.c

@@ -5 +5 @@
 
 // Local Exception Types and manual vtable types.
+#define GLUE2(left, right) left##right
+#define GLUE3(left, middle, right) left##middle##right
 #define BASE_EXCEPT __cfaehm__base_exception_t
-#define TABLE(name) name##_vtable
-#define INSTANCE(name) _##name##_vtable_instance
+#define TABLE(name) GLUE2(name,_vtable)
+#define INSTANCE(name) GLUE3(_,name,_vtable_instance)
 #define TRIVIAL_EXCEPTION(name) \
 struct name; \
 struct TABLE(name) { \
-        struct __cfaehm__base_exception_t_vtable const * parent; \
+        struct TABLE(BASE_EXCEPT) const * parent; \
         size_t size; \
         void (*copy)(name *this, name * other); \
@@ -28 +30 @@
 } \
 TABLE(name) INSTANCE(name) @= { \
-        .parent : &INSTANCE(__cfaehm__base_exception_t), \
+        .parent : &INSTANCE(BASE_EXCEPT), \
         .size : sizeof(name), .copy : name##_copy, \
         .free : ^?{}, .msg : name##_msg \
@@ -40 +42 @@
 struct num_error;
 struct num_error_vtable {
-        struct exception_t_vtable const * parent;
+        struct TABLE(BASE_EXCEPT) const * parent;
         size_t size;
         void (*copy)(num_error *this, num_error * other);
@@ -62 +64 @@
 }
 void ?{}(num_error * this, int num) {
-        this->virtual_table = &_num_error_vtable_instance;
+        this->virtual_table = &INSTANCE(num_error);
         this->msg = 0;
         this->num = num;