Changes in src/ResolvExpr/Resolver.cc [8f557161:251ce80]

File:

• src/ResolvExpr/Resolver.cc (modified) (5 diffs)

src/ResolvExpr/Resolver.cc

@@ -1106 +1106 @@
 
                 /// Removes cast to type of argument (unlike StripCasts, also handles non-generated casts)
-                void removeExtraneousCast( ast::ptr<ast::Expr> & expr ) {
+                void removeExtraneousCast( ast::ptr<ast::Expr> & expr, const ast::SymbolTable & symtab ) {
                         if ( const ast::CastExpr * castExpr = expr.as< ast::CastExpr >() ) {
                                 if ( typesCompatible( castExpr->arg->result, castExpr->result ) ) {
@@ -1196 +1196 @@
                 ast::ptr< ast::Expr > castExpr = new ast::CastExpr{ untyped, type };
                 ast::ptr< ast::Expr > newExpr = findSingleExpression( castExpr, context );
-                removeExtraneousCast( newExpr );
+                removeExtraneousCast( newExpr, context.symtab );
                 return newExpr;
         }
@@ -1261 +1261 @@
                 static size_t traceId;
                 Resolver_new( const ast::TranslationGlobal & global ) :
-                        ast::WithSymbolTable(ast::SymbolTable::ErrorDetection::ValidateOnAdd),
                         context{ symtab, global } {}
                 Resolver_new( const ResolveContext & context ) :
@@ -1341 +1340 @@
                                         auto mutAttr = mutate(attr);
                                         mutAttr->params.front() = resolved;
-                                        if (! result.hasKnownValue) {
+                                        if (! result.second) {
                                                 SemanticWarning(loc, Warning::GccAttributes,
                                                         toCString( name, " priorities must be integers from 0 to 65535 inclusive: ", arg ) );
                                         }
                                         else {
-                                                auto priority = result.knownValue;
+                                                auto priority = result.first;
                                                 if (priority < 101) {
                                                         SemanticWarning(loc, Warning::GccAttributes,
@@ -2041 +2040 @@
                 const ast::Type * initContext = currentObject.getCurrentType();
 
-                removeExtraneousCast( newExpr );
+                removeExtraneousCast( newExpr, symtab );
 
                 // check if actual object's type is char[]