Changeset 1cdfa82 for src/Parser/DeclarationNode.cc

Timestamp:

Apr 25, 2018, 4:55:53 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

42107b4

Parents:

2efe4b8 (diff), 9d5fb67 (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 remote-tracking branch 'origin/master' into with_gc

File:

• src/Parser/DeclarationNode.cc (modified) (9 diffs)

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 22 15:37:17 2018
-// Update Count     : 1033
+// Last Modified On : Fri Apr 20 22:37:20 2018
+// Update Count     : 1063
 //
 
@@ -47 +47 @@
 const char * DeclarationNode::aggregateNames[] = { "struct", "union", "trait", "coroutine", "monitor", "thread", "NoAggregateNames" };
 const char * DeclarationNode::typeClassNames[] = { "otype", "dtype", "ftype", "NoTypeClassNames" };
-const char * DeclarationNode::builtinTypeNames[] = { "__builtin_va_list", "NoBuiltinTypeNames" };
+const char * DeclarationNode::builtinTypeNames[] = { "__builtin_va_list", "zero_t", "one_t", "NoBuiltinTypeNames" };
 
 UniqueName DeclarationNode::anonymous( "__anonymous" );
@@ -71 +71 @@
         attr.expr = nullptr;
         attr.type = nullptr;
+
+        assert.condition = nullptr;
+        assert.message = nullptr;
 }
 
@@ -88 +91 @@
         // asmName, no delete, passed to next stage
         delete initializer;
+
+        delete assert.condition;
+        delete assert.message;
 }
 
@@ -117 +123 @@
         newnode->attr.expr = maybeClone( attr.expr );
         newnode->attr.type = maybeClone( attr.type );
+
+        newnode->assert.condition = maybeClone( assert.condition );
+        newnode->assert.message = maybeClone( assert.message );
         return newnode;
 } // DeclarationNode::clone
@@ -434 +443 @@
         return newnode;
 }
+
+DeclarationNode * DeclarationNode::newStaticAssert( ExpressionNode * condition, Expression * message ) {
+        DeclarationNode * newnode = new DeclarationNode;
+        newnode->assert.condition = condition;
+        newnode->assert.message = message;
+        return newnode;
+}
+
 
 void appendError( string & dst, const string & src ) {
@@ -544 +561 @@
 
         checkQualifiers( type, q->type );
+        if ( (builtin == Zero || builtin == One) && error.length() == 0 ) {
+                SemanticWarning( yylloc, Warning::BadQualifiersZeroOne, Type::QualifiersNames[ilog2( q->type->qualifiers.val )], builtinTypeNames[builtin] );
+//              appendError( error, string( "questionable qualifiers" ) );
+        } // if
         addQualifiersToType( q->type, type );
 
@@ -907 +928 @@
                                 delete newType->aggInst.aggregate->enumeration.constants;
                                 newType->aggInst.aggregate->enumeration.constants = nullptr;
+                                newType->aggInst.aggregate->enumeration.body = false;
                         } else {
                                 assert( newType->aggInst.aggregate->kind == TypeData::Aggregate );
                                 delete newType->aggInst.aggregate->aggregate.fields;
                                 newType->aggInst.aggregate->aggregate.fields = nullptr;
+                                newType->aggInst.aggregate->aggregate.body = false;
                         } // if
                         // don't hoist twice
@@ -1051 +1074 @@
         } // if
 
+        if ( assert.condition ) {
+                return new StaticAssertDecl( maybeBuild< Expression >( assert.condition ), strict_dynamic_cast< ConstantExpr * >( maybeClone( assert.message ) ) );
+        }
+
         // SUE's cannot have function specifiers, either
         //