Changes in / [ce31925:25793da]

Files:

• driver/Makefile.am (modified) (1 diff)
• libcfa/prelude/Makefile.am (modified) (1 diff)
• src/AST/Pass.hpp (modified) (1 diff)
• src/AST/Pass.impl.hpp (modified) (1 diff)
• src/AST/Pass.proto.hpp (modified) (2 diffs)
• src/Common/utility.h (modified) (1 diff)
• src/ControlStruct/LabelFixer.cc (modified) (1 diff)
• src/ControlStruct/LabelFixer.h (modified) (1 diff)
• src/ControlStruct/MLEMutator.cc (modified) (1 diff)
• src/ControlStruct/MLEMutator.h (modified) (1 diff)
• src/GenPoly/InstantiateGenericNew.cpp (modified) (2 diffs)
• src/Makefile.am (modified) (1 diff)
• src/SynTree/Statement.cc (modified) (4 diffs)
• src/SynTree/Statement.h (modified) (2 diffs)

driver/Makefile.am

@@ -19 +19 @@
 
 # applies to both programs
-AM_CXXFLAGS = @HOST_FLAGS@ -Wall -Wextra -Werror=return-type -O2 -g -std=c++14 -I${abs_top_srcdir}/src -I${abs_top_srcdir}/src/include
+AM_CXXFLAGS = @HOST_FLAGS@ -Wall -Wextra -Werror=return-type -O2 -g -std=c++17 -I${abs_top_srcdir}/src -I${abs_top_srcdir}/src/include
 
 # don't install cfa directly

libcfa/prelude/Makefile.am

@@ -50 +50 @@
 
 prelude.cfa : prelude-gen.cc
-        ${AM_V_GEN}${CXX} ${AM_CXXFLAGS} ${CXXFLAGS} ${AM_CFLAGS} ${<} -o prelude-gen -Wall -Wextra -O2 -g -std=c++14
+        ${AM_V_GEN}${CXX} ${AM_CXXFLAGS} ${CXXFLAGS} ${AM_CFLAGS} ${<} -o prelude-gen -Wall -Wextra -O2 -g -std=c++17
         @./prelude-gen > ${@}
         @rm ./prelude-gen

src/AST/Pass.hpp

@@ -327 +327 @@
 struct PureVisitor {};
 
+struct WithCodeLocation {
+        const CodeLocation * location = nullptr;
+};
+
 /// Keep track of the polymorphic const TypeSubstitution * typeSubs for the current expression.
 struct WithConstTypeSubstitution {

src/AST/Pass.impl.hpp

@@ -25 +25 @@
 #define VISIT_START( node ) \
         using namespace ast; \
+        /* back-up the last known code location */ \
+        __attribute__((unused)) auto loc_guard = ast::__pass::make_location_guard( core, node ); \
         /* back-up the visit children */ \
         __attribute__((unused)) ast::__pass::visit_children_guard guard1( ast::__pass::visit_children(core, 0) ); \

src/AST/Pass.proto.hpp

@@ -295 +295 @@
         FIELD_PTR( at_cleanup, __pass::at_cleanup_t )
         FIELD_PTR( visitor, ast::Pass<core_t> * const )
+        FIELD_PTR( location, const CodeLocation * )
 
         // Remove the macro to make sure we don't clash
@@ -324 +325 @@
         static auto on_error (core_t & core, ptr<Decl> & decl, int) -> decltype(core.on_error(decl)) {
                 return core.on_error(decl);
+        }
+
+        template< typename core_t, typename node_t >
+        static auto make_location_guard(core_t & core, node_t * node) -> ValueGuardPtr<const CodeLocation *> {
+                if constexpr (std::is_base_of<ParseNode, node_t>::value) {
+                        const CodeLocation ** p = location(core, 0);
+                        if(p) {
+                                ValueGuardPtr<const CodeLocation *> g = { p };
+                                *p = &node->location;
+                                return g;
+                        }
+                }
+                (void)node;
+                return { nullptr };
         }
 

src/Common/utility.h

@@ -322 +322 @@
 
         ValueGuardPtr(T * inRef) : old( inRef ? *inRef : T() ), ref(inRef) {}
+        ValueGuardPtr(const ValueGuardPtr& other) = delete;
+        ValueGuardPtr(ValueGuardPtr&& other) : old(other.old), ref(other.ref) { other.ref = nullptr; }
         ~ValueGuardPtr() { if( ref ) *ref = old; }
 };

src/ControlStruct/LabelFixer.cc

@@ -119 +119 @@
 
 // Builds a table that maps a label to its defining statement.
-std::map<Label, Statement * > * LabelFixer::resolveJumps() throw ( SemanticErrorException ) {
+std::map<Label, Statement * > * LabelFixer::resolveJumps() {
         std::map< Label, Statement * > *ret = new std::map< Label, Statement * >();
         for ( std::map< Label, Entry * >::iterator i = labelTable.begin(); i != labelTable.end(); ++i ) {

src/ControlStruct/LabelFixer.h

@@ -33 +33 @@
         LabelFixer( LabelGenerator *gen = 0 );
 
-        std::map < Label, Statement * > *resolveJumps() throw ( SemanticErrorException );
+        std::map < Label, Statement * > *resolveJumps();
 
         // Declarations

src/ControlStruct/MLEMutator.cc

@@ -141 +141 @@
 
 
-        Statement *MultiLevelExitMutator::postmutate( BranchStmt *branchStmt )
-                        throw ( SemanticErrorException ) {
+        Statement *MultiLevelExitMutator::postmutate( BranchStmt *branchStmt ) {
                 std::string originalTarget = branchStmt->originalTarget;
 

src/ControlStruct/MLEMutator.h

@@ -41 +41 @@
 
                 void premutate( CompoundStmt *cmpndStmt );
-                Statement * postmutate( BranchStmt *branchStmt ) throw ( SemanticErrorException );
+                Statement * postmutate( BranchStmt *branchStmt );
                 void premutate( WhileDoStmt *whileDoStmt );
                 Statement * postmutate( WhileDoStmt *whileDoStmt );

src/GenPoly/InstantiateGenericNew.cpp

@@ -417 +417 @@
 
 struct GenericInstantiator final :
+                public ast::WithCodeLocation,
+                public ast::WithConstTypeSubstitution,
+                public ast::WithDeclsToAdd<>,
                 public ast::WithGuards,
-                public ast::WithVisitorRef<GenericInstantiator>,
-                public ast::WithConstTypeSubstitution,
-                public ast::WithDeclsToAdd<> {
+                public ast::WithVisitorRef<GenericInstantiator>
+{
         /// Map of (generic type, parameter list) pairs
         /// to concrete type instantiations.
@@ -435 +437 @@
         /// member from an instantiation.
         int memberIndex = -1;
-        /// Keep track of the nearest location to fill in locations.
-        CodeLocation const * location = nullptr;
 
         GenericInstantiator() :

src/Makefile.am

@@ -71 +71 @@
 EXTRA_DIST = include/cassert include/optional BasicTypes-gen.cc
 
-AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -Werror=return-type -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O3 -g -std=c++14 $(TCMALLOCFLAG)
+AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -Werror=return-type -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O3 -g -std=c++17 $(TCMALLOCFLAG)
 AM_LDFLAGS  = @HOST_FLAGS@ -Xlinker -export-dynamic
 ARFLAGS     = cr

src/SynTree/Statement.cc

@@ -105 +105 @@
 };
 
-BranchStmt::BranchStmt( Label target, Type type ) throw ( SemanticErrorException ) :
+BranchStmt::BranchStmt( Label target, Type type ) :
         Statement(), originalTarget( target ), target( target ), computedTarget( nullptr ), type( type ) {
         //actually this is a syntactic error signaled by the parser
@@ -113 +113 @@
 }
 
-BranchStmt::BranchStmt( Expression * computedTarget, Type type ) throw ( SemanticErrorException ) :
+BranchStmt::BranchStmt( Expression * computedTarget, Type type ) :
         Statement(), computedTarget( computedTarget ), type( type ) {
         if ( type != BranchStmt::Goto || computedTarget == nullptr ) {
@@ -211 +211 @@
 }
 
-CaseStmt::CaseStmt( Expression * condition, const list<Statement *> & statements, bool deflt ) throw ( SemanticErrorException ) :
+CaseStmt::CaseStmt( Expression * condition, const list<Statement *> & statements, bool deflt ) :
                 Statement(), condition( condition ), stmts( statements ), _isDefault( deflt ) {
         if ( isDefault() && condition != nullptr ) SemanticError( condition, "default case with condition: " );
@@ -575 +575 @@
 }
 
-MutexStmt::MutexStmt( Statement * stmt, const list<Expression *> mutexObjs ) 
+MutexStmt::MutexStmt( Statement * stmt, const list<Expression *> mutexObjs )
         : Statement(), stmt( stmt ), mutexObjs( mutexObjs ) { }
 

src/SynTree/Statement.h

@@ -200 +200 @@
         std::list<Statement *> stmts;
 
-        CaseStmt( Expression * conditions, const std::list<Statement *> & stmts, bool isdef = false ) throw (SemanticErrorException);
+        CaseStmt( Expression * conditions, const std::list<Statement *> & stmts, bool isdef = false );
         CaseStmt( const CaseStmt & other );
         virtual ~CaseStmt();
@@ -289 +289 @@
         Type type;
 
-        BranchStmt( Label target, Type ) throw (SemanticErrorException);
-        BranchStmt( Expression * computedTarget, Type ) throw (SemanticErrorException);
+        BranchStmt( Label target, Type );
+        BranchStmt( Expression * computedTarget, Type );
 
         Label get_originalTarget() { return originalTarget; }