Changeset 936a287

Timestamp:

Mar 30, 2017, 5:21:14 PM (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:

077810d, 72dc82a

Parents:

fbcde64 (diff), a4dd728 (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

Files:

• doc/LaTeXmacros/common.tex (modified) (2 diffs)
• doc/rob_thesis/ctordtor.tex (modified) (1 diff)
• doc/rob_thesis/tuples.tex (modified) (3 diffs)
• src/InitTweak/FixInit.cc (modified) (2 diffs)
• src/InitTweak/GenInit.cc (modified) (1 diff)
• src/libcfa/iostream.c (modified) (1 diff)

doc/LaTeXmacros/common.tex

@@ -42 +42 @@
 \newcommand{\CCfourteen}{\rm C\kern-.1em\hbox{+\kern-.25em+}14\xspace} % C++14 symbolic name
 \newcommand{\CCseventeen}{\rm C\kern-.1em\hbox{+\kern-.25em+}17\xspace} % C++17 symbolic name
+\newcommand{\CCtwenty}{\rm C\kern-.1em\hbox{+\kern-.25em+}20} % C++20 symbolic name
 \newcommand{\Celeven}{C11\xspace}               % C11 symbolic name
 \newcommand{\Csharp}{C\raisebox{0.4ex}{\#}\xspace}      % C# symbolic name
@@ -252 +253 @@
                 _Bool,catch,catchResume,choose,_Complex,__complex,__complex__,__const,__const__,disable,dtype,enable,__extension__,
                 fallthrough,fallthru,finally,forall,ftype,_Generic,_Imaginary,inline,__label__,lvalue,_Noreturn,one_t,otype,restrict,_Static_assert,
-                _Thread_local,throw,throwResume,trait,try,typeof,__typeof,__typeof__,zero_t},
+                _Thread_local,throw,throwResume,trait,try,ttype,typeof,__typeof,__typeof__,zero_t},
 }%
 

doc/rob_thesis/ctordtor.tex

@@ -135 +135 @@
 %   at the global scope (which is likely the most common case)
 % * [9]
-
-% Move semantics
-% * <ongoing discussion about this. this will be filled in
-%    once we come to a consensus>
 
 % Changes to polymorphic type classes

doc/rob_thesis/tuples.tex

@@ -615 +615 @@
 \end{cfacode}
 Note that due to flattening, @x@ used in the argument position is converted into the list of its fields.
-In the call to @f@, a the second and third argument components are structured into a tuple argument.
+In the call to @f@, the second and third argument components are structured into a tuple argument.
 
 Expressions which may contain side effects are made into \emph{unique expressions} before being expanded by the flattening conversion.
@@ -643 +643 @@
 \end{cfacode}
 Since argument evaluation order is not specified by the C programming language, this scheme is built to work regardless of evaluation order.
-The first time a unique expression is executed, the actual expression is evaluated and the accompanying boolean is true to true.
+The first time a unique expression is executed, the actual expression is evaluated and the accompanying boolean is set to true.
 Every subsequent evaluation of the unique expression then results in an access to the stored result of the actual expression.
 
@@ -1299 +1299 @@
 Thunks 0 through 3 provide wrappers for the @otype@ parameters for @const char *@, while @_thunk4@ translates a call to @print([int, const char *])@ into a call to @print_variadic(int, [const char *])@.
 This all builds to a call to @print_variadic@, with the appropriate copy construction of the tuple argument.
+
+\section{Future Work}

src/InitTweak/FixInit.cc

@@ -738 +738 @@
                                                 stmtsToAddAfter.push_back( ifStmt );
 
-                                                if ( ctorInit->get_dtor() ) {
+                                                Statement * dtor = ctorInit->get_dtor();
+                                                objDecl->set_init( NULL );
+                                                ctorInit->set_ctor( NULL );
+                                                ctorInit->set_dtor( nullptr );
+                                                if ( dtor ) {
                                                         // if the object has a non-trivial destructor, have to
                                                         // hoist it and the object into the global space and
                                                         // call the destructor function with atexit.
 
-                                                        Statement * dtorStmt = ctorInit->get_dtor()->clone();
+                                                        Statement * dtorStmt = dtor->clone();
 
                                                         // void __objName_dtor_atexitN(...) {...}
@@ -772 +776 @@
                                                         objDecl->set_mangleName( SymTab::Mangler::mangle( objDecl ) );
 
-                                                        objDecl->set_init( NULL );
-                                                        ctorInit->set_ctor( NULL );
-                                                        delete ctorInit;
-
                                                         // xxx - temporary hack: need to return a declaration, but want to hoist the current object out of this scope
                                                         // create a new object which is never used
                                                         static UniqueName dummyNamer( "_dummy" );
                                                         ObjectDecl * dummy = new ObjectDecl( dummyNamer.newName(), Type::StorageClasses( Type::Static ), LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new VoidType( Type::Qualifiers() ) ), 0, std::list< Attribute * >{ new Attribute("unused") } );
+                                                        delete ctorInit;
                                                         return dummy;
                                                 }

src/InitTweak/GenInit.cc

@@ -294 +294 @@
                 handleDWT( objDecl );
                 // hands off if @=, extern, builtin, etc.
-                // if global but initializer is not constexpr, always try to construct, since this is not legal C
-                if ( ( tryConstruct( objDecl ) && isManaged( objDecl ) ) || (! inFunction && ! isConstExpr( objDecl->get_init() ) ) ) {
+                // even if unmanaged, try to construct global or static if initializer is not constexpr, since this is not legal C
+                if ( tryConstruct( objDecl ) && ( isManaged( objDecl ) || ((! inFunction || objDecl->get_storageClasses().is_static ) && ! isConstExpr( objDecl->get_init() ) ) ) ) {
                         // constructed objects cannot be designated
-                        if ( isDesignated( objDecl->get_init() ) ) throw SemanticError( "Cannot include designations in the initializer for a managed Object. If this is really what you want, then initialize with @=.", objDecl );
+                        if ( isDesignated( objDecl->get_init() ) ) throw SemanticError( "Cannot include designations in the initializer for a managed Object. If this is really what you want, then initialize with @=.\n", objDecl );
                         // constructed objects should not have initializers nested too deeply
                         if ( ! checkInitDepth( objDecl ) ) throw SemanticError( "Managed object's initializer is too deep ", objDecl );

src/libcfa/iostream.c

@@ -154 +154 @@
 ostype * ?|?( ostype * os, const char * cp ) {
         enum { Open = 1, Close, OpenClose };
-        static const unsigned char mask[256] = {
+        static const unsigned char mask[256] @= {
                 // opening delimiters, no space after
                 ['('] : Open, ['['] : Open, ['{'] : Open,