Changeset 29038ef for src

Timestamp:

Jul 7, 2017, 10:39:13 AM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

54d714e, b5f9829

Parents:

53a6c2a (diff), e182ce3 (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 plg2:software/cfa/cfa-cc

Location:

src

Files:

• GenPoly/InstantiateGeneric.cc (modified) (1 diff)
• InitTweak/GenInit.cc (modified) (2 diffs)
• Parser/parser.yy (modified) (1 diff)
• ResolvExpr/CurrentObject.cc (modified) (1 diff)
• tests/.expect/32/math.txt (modified) (1 diff)

src/GenPoly/InstantiateGeneric.cc

@@ -171 +171 @@
                 Type* postmutate( UnionInstType *inst );
 
-                void premutate( FunctionType * ftype ) {
+                void premutate( __attribute__((unused)) FunctionType * ftype ) {
                         GuardValue( inFunctionType );
                         inFunctionType = true;

src/InitTweak/GenInit.cc

@@ -71 +71 @@
                 // that need to be constructed or destructed
                 void previsit( StructDecl *aggregateDecl );
-                void previsit( UnionDecl *aggregateDecl ) { visit_children = false; }
-                void previsit( EnumDecl *aggregateDecl ) { visit_children = false; }
-                void previsit( TraitDecl *aggregateDecl ) { visit_children = false; }
-                void previsit( TypeDecl *typeDecl ) { visit_children = false; }
-                void previsit( TypedefDecl *typeDecl ) { visit_children = false; }
-
-                void previsit( FunctionType *funcType ) { visit_children = false; }
+                void previsit( __attribute__((unused)) UnionDecl    * aggregateDecl ) { visit_children = false; }
+                void previsit( __attribute__((unused)) EnumDecl     * aggregateDecl ) { visit_children = false; }
+                void previsit( __attribute__((unused)) TraitDecl    * aggregateDecl ) { visit_children = false; }
+                void previsit( __attribute__((unused)) TypeDecl     * typeDecl )      { visit_children = false; }
+                void previsit( __attribute__((unused)) TypedefDecl  * typeDecl )      { visit_children = false; }
+                void previsit( __attribute__((unused)) FunctionType * funcType )      { visit_children = false; }
 
                 void previsit( CompoundStmt * compoundStmt );
@@ -336 +335 @@
         }
 
-        void CtorDtor::previsit( CompoundStmt * compoundStmt ) {
+        void CtorDtor::previsit( __attribute__((unused)) CompoundStmt * compoundStmt ) {
                 GuardScope( managedTypes );
         }

src/Parser/parser.yy

@@ -2332 +2332 @@
         | TYPEGENname
         | CONST
-                { $$ = Token{ new string( "__const__" ) }; }
+                { $$ = Token{ new string( "__const__" ), { nullptr, -1 } }; }
         ;
 

src/ResolvExpr/CurrentObject.cc

@@ -127 +127 @@
                 }
 
-                virtual void print( std::ostream & out, Indenter indent ) const {
+                virtual void print( std::ostream & out, __attribute__((unused)) Indenter indent ) const {
                         out << "SimpleIterator(" << type << ")";
                 }

src/tests/.expect/32/math.txt

@@ -22 +22 @@
 cos:0.540302 0.54030230586814 0.540302305868139717 0.83373-0.988898i 0.833730025131149-0.988897705762865i 0.833730025131149049-0.988897705762865096i
 tan:1.55741 1.5574077246549 1.55740772465490223 0.271753+1.08392i 0.271752585319512+1.08392332733869i 0.271752585319511717+1.08392332733869454i
-asin:1.5708 1.5707963267949 1.57079632679489662 0.66624+1.06128i 0.666239432492515+1.06127506190504i 0.666239432492515255+1.06127506190503565i
+asin:1.5708 1.5707963267949 1.57079632679489662 0.666239+1.06128i 0.666239432492515+1.06127506190504i 0.666239432492515255+1.06127506190503565i
 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