Changes in / [8217e8f:36a5a77]

Files:

• doc/proposals/virtual.txt (modified) (3 diffs)
• src/Common/Indenter.h (modified) (1 diff)
• src/ControlStruct/MLEMutator.cc (modified) (2 diffs)
• src/Parser/DeclarationNode.cc (modified) (2 diffs)
• src/Parser/ParseNode.h (modified) (3 diffs)
• src/Parser/TypeData.cc (modified) (8 diffs)
• src/Parser/TypeData.h (modified) (2 diffs)
• src/SynTree/Declaration.h (modified) (5 diffs)
• src/tests/.expect/32/math.txt (added)
• src/tests/.expect/32/math1.txt (deleted)
• src/tests/.expect/32/math2.txt (deleted)
• src/tests/.expect/32/math3.txt (deleted)
• src/tests/.expect/64/math.txt (added)
• src/tests/.expect/64/math1.txt (deleted)
• src/tests/.expect/64/math2.txt (deleted)
• src/tests/.expect/64/math3.txt (deleted)
• src/tests/math.c (added)
• src/tests/math1.c (deleted)
• src/tests/math2.c (deleted)
• src/tests/math3.c (deleted)
• src/tests/pybin/tools.py (modified) (2 diffs)

doc/proposals/virtual.txt

@@ -147 +147 @@
 
 This gives us an important extra feature, runtime checking of the parent-child
-relationship with virtual cast, where a pointer (and maybe a reference) to
-a virtual type can be cast to another virtual cast. However the cast is
-dynamicly check and only occurs if the underlying type is a child of the type
-being cast to. Otherwise null is returned.
-
-(virtual TYPE)EXPR
-
-As an extention, the TYPE may be ommitted if it can be determained from
-context, for instance if the cast occurs on the right hand side of an
-assignment.
+relationship with a C++ dynamic_cast like operation. Allowing checked
+conversions from trait references to more particular references, which works
+if the underlying type is, or is a child of, the new trait type.
 
 Extension: Multiple Parents
@@ -258 +251 @@
 autogenerated and often unique.
 
-It may be worth looking into a way to force the vtable pointer to be in a
-particular location, which would save the storage to store the offset and
-maybe the offset operation itself (offset = 0). However it may not be worth
-introducing a new language feature for.
-As of writing, exceptions actually use this system.
-
 
 Keyword Usage:
@@ -289 +276 @@
 Calling free on a trait reference will free the memory for the object. It will
 leave the vtables alone, as those are (always?) statically allocated.
-
-
-Special Traits:
-
-trait is_virtual_parent(dtype parent, dtype child) { ... };
-
-There are others but I believe this one to be the most important. The trait
-holds if the parent type is a strict virtual ancestor (any number of levels)
-of child. It will have to exist at least internally to check for upcasts and
-it can also be used to optimize virtual casts into upcasts. Or a null value or
-error if the cast would never succeed. Exporting it to a special trait allows
-users to express that requirement in their own polymorphic code.
-
-
-Implementation:
-
-Before we can generate any of the nessasary code, the compiler has to get some
-additional information about the code that it currently does not collect.
-
-First it should establish all child->parent links so that it may travel up the
-hierarchy to grab the nessasary information, and create the actual parent
-pointers in the strict virtual tables. It should also maintain the connections
-between the virtual type (structure or trait), the vtable type and the vtable
-instance (or default instance for relaxed virtual if multiple are allowed). To
-this end a sub-node should be created with the nessasary pointers. Traits and
-structs with virtual can create an instance and store all the nessasary data.
-
-With the hierarchy in place it can generate the vtable type for each type,
-it will generally have a function pointer field for each type assertion in
-some consistant order. Strict virtual will also have a pointer to the parent's
-vtable and intrusive vtables will also have the offset to recover the original
-pointer. Sized types will also carry the size.
-
-Wheither the vtable is intrusive or not should also be save so that the trait
-object/reference/pointer knows if it has to store 1 or 2 pointers. A wrapper
-function will have to be generated for each type assertion so that they may
-be called on the trait type, these can probably be inlined.
-
-The virtual parameter will also have to be marked (implicately or explicately)
-until code generation so that the wrapper functions know where to go to get
-the vtable for the function look up. That could probably be added as a
-storageclass, although one that is only valid on type assertions.
-
-The generated vtable will than have to have a vtable instance created and
-filled with all the approprate values. Stricter matching may have to be used
-to ensure that the functions used are stable. It will also have to use
-".gnu.linkonce" or equilant to ensure only one copy exists in the final code
-base.

src/Common/Indenter.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Indenter.h --
+// utility.h --
 //
-// Author           : Rob Schluntz
-// Created On       : Fri Jun 30 16:55:23 2017
+// Author           : Richard C. Bilson
+// Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Aug 11 11:15:00 2017
-// Update Count     : 1
+// Last Modified On : Fri May 5 11:03:00 2017
+// Update Count     : 32
 //
 

src/ControlStruct/MLEMutator.cc

@@ -154 +154 @@
                 return switchStmt;
         }
-
-        void addUnused( Statement * stmt, const Label & originalTarget ) {
-                // break/continue without a label doesn't need unused attribute
-                if ( originalTarget == "" ) return;
-                // add unused attribute to the originalTarget of a labelled break/continue
-                for ( Label & l : stmt->get_labels() ) {
-                        // find the label to add unused attribute to
-                        if ( l == originalTarget ) {
-                                for ( Attribute * attr : l.get_attributes() ) {
-                                        // ensure attribute isn't added twice
-                                        if ( attr->get_name() == "unused" ) return;
-                                }
-                                l.get_attributes().push_back( new Attribute( "unused" ) );
-                                return;
-                        }
-                }
-                assertf( false, "Could not find label '%s' on statement %s", originalTarget.get_name().c_str(), toString( stmt ).c_str() );
-        }
-
 
         Statement *MLEMutator::mutate( BranchStmt *branchStmt ) throw ( SemanticError ) {
@@ -223 +204 @@
                 } // switch
 
-                // add unused attribute to label to silence warnings
-                addUnused( targetEntry->get_controlStructure(), branchStmt->get_originalTarget() );
-
                 // transform break/continue statements into goto to simplify later handling of branches
                 delete branchStmt;

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Thr Aug 10 17:02:00 2017
-// Update Count     : 1021
+// Last Modified On : Fri Jul 14 16:55:00 2017
+// Update Count     : 1020
 //
 
@@ -275 +275 @@
         return newnode;
 } // DeclarationNode::newEnumConstant
+
+DeclarationNode * DeclarationNode::newTreeStruct( Aggregate kind, const string * name, const string * parent, ExpressionNode * actuals, DeclarationNode * fields, bool body ) {
+        assert( name );
+        DeclarationNode * newnode = new DeclarationNode;
+        newnode->type = new TypeData( TypeData::Aggregate );
+        newnode->type->aggregate.kind = kind;
+        newnode->type->aggregate.name = name;
+        newnode->type->aggregate.actuals = actuals;
+        newnode->type->aggregate.fields = fields;
+        newnode->type->aggregate.body = body;
+        newnode->type->aggregate.tagged = true;
+        newnode->type->aggregate.parent = parent;
+        return newnode;
+} // DeclarationNode::newTreeStruct
 
 DeclarationNode * DeclarationNode::newName( string * name ) {

src/Parser/ParseNode.h

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:28:16 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Thu Aug 10 16:54:00 2017
-// Update Count     : 789
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jul 27 12:08:08 2017
+// Update Count     : 788
 //
 
@@ -248 +248 @@
         static DeclarationNode * newAsmStmt( StatementNode * stmt ); // gcc external asm statement
 
+        // Perhaps this would best fold into newAggragate.
+        static DeclarationNode * newTreeStruct( Aggregate kind, const std::string * name, const std::string * parent, ExpressionNode * actuals, DeclarationNode * fields, bool body );
+
         DeclarationNode();
         ~DeclarationNode();
@@ -332 +335 @@
 
         static UniqueName anonymous;
+
+        // Temp to test TreeStruct
+        const std::string * parent_name;
 }; // DeclarationNode
 

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Aug 14 10:41:00 2017
-// Update Count     : 568
+// Last Modified On : Wed Aug  9 13:50:00 2017
+// Update Count     : 567
 //
 
@@ -64 +64 @@
                 aggregate.fields = nullptr;
                 aggregate.body = false;
+                aggregate.tagged = false;
+                aggregate.parent = nullptr;
                 break;
           case AggregateInst:
@@ -123 +125 @@
                 delete aggregate.actuals;
                 delete aggregate.fields;
+                delete aggregate.parent;
                 // delete aggregate;
                 break;
@@ -637 +640 @@
         switch ( td->aggregate.kind ) {
           case DeclarationNode::Struct:
+                if ( td->aggregate.tagged ) {
+                        at = new StructDecl( *td->aggregate.name, td->aggregate.parent, attributes, linkage );
+                        buildForall( td->aggregate.params, at->get_parameters() );
+                        break;
+                }
           case DeclarationNode::Coroutine:
           case DeclarationNode::Monitor:
@@ -644 +652 @@
                 break;
           case DeclarationNode::Union:
-                at = new UnionDecl( *td->aggregate.name, attributes, linkage );
+                at = new UnionDecl( *td->aggregate.name, attributes );
                 buildForall( td->aggregate.params, at->get_parameters() );
                 break;
           case DeclarationNode::Trait:
-                at = new TraitDecl( *td->aggregate.name, attributes, linkage );
+                at = new TraitDecl( *td->aggregate.name, attributes );
                 buildList( td->aggregate.params, at->get_parameters() );
                 break;
@@ -665 +673 @@
           case TypeData::Enum: {
                   if ( type->enumeration.body ) {
-                          EnumDecl * typedecl = buildEnum( type, attributes, linkage );
+                          EnumDecl * typedecl = buildEnum( type, attributes );
                           return new EnumInstType( buildQualifiers( type ), typedecl );
                   } else {
@@ -770 +778 @@
 } // buildSymbolic
 
-EnumDecl * buildEnum( const TypeData * td, std::list< Attribute * > attributes, LinkageSpec::Spec linkage ) {
+EnumDecl * buildEnum( const TypeData * td, std::list< Attribute * > attributes ) {
         assert( td->kind == TypeData::Enum );
-        EnumDecl * ret = new EnumDecl( *td->enumeration.name, attributes, linkage );
+        EnumDecl * ret = new EnumDecl( *td->enumeration.name, attributes );
         buildList( td->enumeration.constants, ret->get_members() );
         list< Declaration * >::iterator members = ret->get_members().begin();
@@ -823 +831 @@
                 return buildAggregate( td, attributes, linkage );
         } else if ( td->kind == TypeData::Enum ) {
-                return buildEnum( td, attributes, linkage );
+                return buildEnum( td, attributes );
         } else if ( td->kind == TypeData::Symbolic ) {
                 return buildSymbolic( td, name, scs, linkage );

src/Parser/TypeData.h

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 15:18:36 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Aug 14 10:38:00 2017
-// Update Count     : 189
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:32:47 2017
+// Update Count     : 188
 //
 
@@ -108 +108 @@
 ReferenceToType * buildAggInst( const TypeData * );
 TypeDecl * buildVariable( const TypeData * );
-EnumDecl * buildEnum( const TypeData *, std::list< Attribute * >, LinkageSpec::Spec );
+EnumDecl * buildEnum( const TypeData *, std::list< Attribute * > );
 TypeInstType * buildSymbolicInst( const TypeData * );
 TupleType * buildTuple( const TypeData * );

src/SynTree/Declaration.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Aug 14 10:15:00 2017
-// Update Count     : 128
+// Last Modified On : Wed Aug  9 14:45:00 2017
+// Update Count     : 126
 //
 
@@ -269 +269 @@
         typedef AggregateDecl Parent;
   public:
-        StructDecl( const std::string &name, DeclarationNode::Aggregate kind = DeclarationNode::Struct, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall ) : Parent( name, attributes, linkage ), kind( kind ) {}
-        StructDecl( const StructDecl &other ) : Parent( other ), kind( other.kind ) {}
+        StructDecl( const std::string &name, DeclarationNode::Aggregate kind = DeclarationNode::Struct, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall ) : Parent( name, attributes, linkage ), kind( kind ), tagged( false ), parent_name( "" ) {}
+        StructDecl( const std::string &name, const std::string *parent, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall ) : Parent( name, attributes, linkage ), kind( DeclarationNode::Struct ), tagged( true ), parent_name( parent ? *parent : "" ) {}
+        StructDecl( const StructDecl &other ) : Parent( other ) {}
 
         bool is_coroutine() { return kind == DeclarationNode::Coroutine; }
@@ -276 +277 @@
         bool is_thread() { return kind == DeclarationNode::Thread; }
 
+        // Tagged/Tree Structure Excetion
+        bool get_tagged() { return tagged; }
+        void set_tagged( bool newValue ) { tagged = newValue; }
+        bool has_parent() { return parent_name != ""; }
+        std::string get_parentName() { return parent_name; }
+
         virtual StructDecl *clone() const { return new StructDecl( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
@@ -282 +289 @@
         DeclarationNode::Aggregate kind;
         virtual std::string typeString() const;
+
+        bool tagged;
+        std::string parent_name;
 };
 
@@ -313 +323 @@
         typedef AggregateDecl Parent;
   public:
-        TraitDecl( const std::string &name, const std::list< Attribute * > & attributes, LinkageSpec::Spec linkage ) : Parent( name, attributes, linkage ) {
+        TraitDecl( const std::string &name, const std::list< Attribute * > & attributes ) : Parent( name ) {
                 assertf( attributes.empty(), "attribute unsupported for traits" );
         }

src/tests/pybin/tools.py

@@ -85 +85 @@
                                 "--unchanged-group-format='%%=' \\"
                                 "--changed-group-format='\t\texpected :\n"
-                                "%%<"
+                                "%%<\n"
                                 "\t\tgot :\n"
-                                "%%>\n' \\\n"
+                                "%%>' \\\n"
                                 "--new-line-format='\t\t%%dn\t%%L' \\\n"
                                 "--old-line-format='\t\t%%dn\t%%L' \\\n"
@@ -94 +94 @@
 
         # fetch return code and error from the diff command
-        return sh(diff_cmd % (lhs, rhs), dry_run, False)
+        return sh(diff_cmd % (lhs, rhs), dry_run, False)