Changeset 62d62db for src/ResolvExpr

Timestamp:

Jun 12, 2023, 6:06:26 PM (2 years ago)

Author:

caparsons <caparson@…>

Branches:

ast-experimental, master

Children:

e172f42

Parents:

24d6572 (diff), 38e266ca (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' into ast-experimental

Location:

src/ResolvExpr

Files:

• CommonType.cc (modified) (1 diff)
• Resolver.cc (modified) (4 diffs)

src/ResolvExpr/CommonType.cc

@@ -1035 +1035 @@
                 void postvisit( const ast::TraitInstType * ) {}
 
-                void postvisit( const ast::TypeInstType * inst ) {}
-
-                void postvisit( const ast::TupleType * tuple) {
+                void postvisit( const ast::TypeInstType * ) {}
+
+                void postvisit( const ast::TupleType * tuple ) {
                         tryResolveWithTypedEnum( tuple );
                 }

src/ResolvExpr/Resolver.cc

@@ -1107 +1107 @@
 
                 /// Removes cast to type of argument (unlike StripCasts, also handles non-generated casts)
-                void removeExtraneousCast( ast::ptr<ast::Expr> & expr, const ast::SymbolTable & symtab ) {
+                void removeExtraneousCast( ast::ptr<ast::Expr> & expr ) {
                         if ( const ast::CastExpr * castExpr = expr.as< ast::CastExpr >() ) {
                                 if ( typesCompatible( castExpr->arg->result, castExpr->result ) ) {
@@ -1197 +1197 @@
                 ast::ptr< ast::Expr > castExpr = new ast::CastExpr{ untyped, type };
                 ast::ptr< ast::Expr > newExpr = findSingleExpression( castExpr, context );
-                removeExtraneousCast( newExpr, context.symtab );
+                removeExtraneousCast( newExpr );
                 return newExpr;
         }
@@ -1262 +1262 @@
                 static size_t traceId;
                 Resolver_new( const ast::TranslationGlobal & global ) :
+                        ast::WithSymbolTable(ast::SymbolTable::ErrorDetection::ValidateOnAdd),
                         context{ symtab, global } {}
                 Resolver_new( const ResolveContext & context ) :
@@ -2041 +2042 @@
                 const ast::Type * initContext = currentObject.getCurrentType();
 
-                removeExtraneousCast( newExpr, symtab );
+                removeExtraneousCast( newExpr );
 
                 // check if actual object's type is char[]