Changeset 822332e

Timestamp:

May 30, 2024, 2:36:08 PM (6 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

0f5e8cd

Parents:

91b9e10

Message:

It seems clang uses different scoping rules for the trailing return of a scoped runction declaration. This form seems compatable with clang and gcc. Since I switched over to clang for testing I also cleaned up all errors that clang or gcc mentioned.

Location:

src

Files:

• AST/Pass.hpp (modified) (1 diff)
• AST/Pass.proto.hpp (modified) (1 diff)
• AST/Print.cpp (modified) (1 diff)
• ResolvExpr/CommonType.cpp (modified) (1 diff)
• ResolvExpr/Unify.cpp (modified) (2 diffs)
• Tuples/Tuples.hpp (modified) (1 diff)
• Validate/ImplementEnumFunc.cpp (modified) (4 diffs)

src/AST/Pass.hpp

@@ -352 +352 @@
 
         template< typename core_t >
-        friend auto __pass::make_value_guard( core_t & core, int ) -> decltype( value_guard( core.at_cleanup ) );
+        friend auto __pass::make_value_guard( core_t & core, int )
+                -> decltype( __pass::value_guard( core.at_cleanup ) );
 public:
 

src/AST/Pass.proto.hpp

@@ -326 +326 @@
 template< typename core_t >
 static inline auto make_value_guard( core_t & core, int )
-                -> decltype( value_guard( core.at_cleanup ) ) {
+                -> decltype( __pass::value_guard( core.at_cleanup ) ) {
         // Requires guaranteed copy elision:
         return value_guard( core.at_cleanup );

src/AST/Print.cpp

@@ -103 +103 @@
         }
 
-        static const char* Names[];
-
         void print( const std::vector<ast::Label> & labels ) {
                 if ( labels.empty() ) return;

src/ResolvExpr/CommonType.cpp

@@ -353 +353 @@
         ast::AssertionSet & have;
 public:
-        static size_t traceId;
         ast::ptr< ast::Type > result;
 

src/ResolvExpr/Unify.cpp

@@ -274 +274 @@
         void previsit( const ast::Node * ) { visit_children = false; }
 
-        void postvisit( const ast::VoidType * vt) {
-                result = dynamic_cast< const ast::VoidType * >( type2 ); 
+        void postvisit( const ast::VoidType * ) {
+                result = dynamic_cast< const ast::VoidType * >( type2 );
                         // || tryToUnifyWithEnumValue(vt, type2, tenv, need, have, open, noWiden());
                 ;
@@ -610 +610 @@
         }
 
-        void postvisit( const ast::VarArgsType * vat) {
+        void postvisit( const ast::VarArgsType * ) {
                 result = dynamic_cast< const ast::VarArgsType * >( type2 );
                         // || tryToUnifyWithEnumValue(vat, type2, tenv, need, have, open, noWiden());
         }
 
-        void postvisit( const ast::ZeroType * zt) {
+        void postvisit( const ast::ZeroType * ) {
                 result = dynamic_cast< const ast::ZeroType * >( type2 );
                         // || tryToUnifyWithEnumValue(zt, type2, tenv, need, have, open, noWiden());
         }
 
-        void postvisit( const ast::OneType * ot) {
+        void postvisit( const ast::OneType * ) {
                 result = dynamic_cast< const ast::OneType * >( type2 );
                         // || tryToUnifyWithEnumValue(ot, type2, tenv, need, have, open, noWiden());

src/Tuples/Tuples.hpp

@@ -22 +22 @@
 #include "AST/Node.hpp"
 namespace ResolvExpr {
-        class CandidateFinder;
+        struct CandidateFinder;
 }
 

src/Validate/ImplementEnumFunc.cpp

@@ -9 +9 @@
 class EnumAttrFuncGenerator {
         const ast::EnumDecl* decl;
-        const ast::EnumInstType* instType;
         unsigned int functionNesting;
         ast::Linkage::Spec proto_linkage;
@@ -21 +20 @@
         EnumAttrFuncGenerator(
                         const ast::EnumDecl* decl,
-                        const ast::EnumInstType* instType,
+                        const ast::EnumInstType*,
                         unsigned int functionNesting )
                 : decl(decl),
-                  instType{instType},
                   functionNesting{functionNesting},
                   proto_linkage{ast::Linkage::Cforall} {}
@@ -50 +48 @@
         ast::FunctionDecl* genFromInstanceProto() const;
         ast::FunctionDecl* genInstToInstFuncProto(const char* func) const;
-        void genFromIntBody(ast::FunctionDecl *) const; 
+        void genFromIntBody(ast::FunctionDecl *) const;
         void genFromInstanceBody(ast::FunctionDecl *) const;
         void genSuccPredBody(ast::FunctionDecl *, const char *) const;
@@ -388 +386 @@
         if (decl->base) genTypedEnumFunction(ast::EnumAttribute::Value);
         genTypedEnumFunction(ast::EnumAttribute::Label);
-        genTypedEnumFunction(ast::EnumAttribute::Posn); 
+        genTypedEnumFunction(ast::EnumAttribute::Posn);
 }