Changeset f6e3e34 for src/Parser

Timestamp:

Apr 3, 2018, 11:13:10 AM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, with_gc

Children:

92fea32

Parents:

3d2b7bc

Message:

Add StaticAssertDecl? node

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (5 diffs)
• ParseNode.h (modified) (2 diffs)
• parser.yy (modified) (1 diff)

src/Parser/DeclarationNode.cc

@@ -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 ) {
@@ -1052 +1069 @@
         } // 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
         //

src/Parser/ParseNode.h

@@ -246 +246 @@
         static DeclarationNode * newAttribute( std::string *, ExpressionNode * expr = nullptr ); // gcc attributes
         static DeclarationNode * newAsmStmt( StatementNode * stmt ); // gcc external asm statement
+        static DeclarationNode * newStaticAssert( ExpressionNode * condition, Expression * message );
 
         DeclarationNode();
@@ -313 +314 @@
         Attr_t attr;
 
+        struct StaticAssert_t {
+                ExpressionNode * condition;
+                Expression * message;
+        };
+        StaticAssert_t assert;
+
         BuiltinType builtin;
 

src/Parser/parser.yy

@@ -1308 +1308 @@
 static_assert:
         STATICASSERT '(' constant_expression ',' string_literal ')' ';' // C11
-                { SemanticError( yylloc, "Static assert is currently unimplemented." ); $$ = nullptr; } // FIX ME
+                { $$ = DeclarationNode::newStaticAssert( $3, $5 ); }
 
 // C declaration syntax is notoriously confusing and error prone. Cforall provides its own type, variable and function