Changeset e6d39fe for src/Parser

Timestamp:

Apr 20, 2018, 9:04:41 AM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

22bdc34

Parents:

9181f1d (diff), 88f15ae (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 plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (4 diffs)
• ExpressionNode.cc (modified) (3 diffs)
• ParseNode.h (modified) (1 diff)
• TypeData.cc (modified) (3 diffs)
• parser.yy (modified) (7 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 : Thu Apr 19 15:09:29 2018
+// Update Count     : 1062
 //
 
@@ -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" );
@@ -561 +561 @@
 
         checkQualifiers( type, q->type );
+        if ( (builtin == Zero || builtin == One) && error.length() == 0 ) {
+                SemanticWarning( yylloc, Warning::BadQualifiersZeroOne, Type::QualifiersNames[log2( q->type->qualifiers.val )], builtinTypeNames[builtin] );
+//              appendError( error, string( "questionable qualifiers" ) );
+        } // if
         addQualifiersToType( q->type, type );
 
@@ -924 +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

src/Parser/ExpressionNode.cc

@@ -211 +211 @@
         if ( Unsigned && size < 2 ) {                                           // hh or h, less than int ?
                 // int i = -1uh => 65535 not -1, so cast is necessary for unsigned, which unfortunately eliminates warnings for large values.
-                ret = new CastExpr( ret, new BasicType( Type::Qualifiers(), kind[Unsigned][size] ) );
+                ret = new CastExpr( ret, new BasicType( Type::Qualifiers(), kind[Unsigned][size] ), false );
         } else if ( lnth != -1 ) {                                                      // explicit length ?
                 if ( lnth == 5 ) {                                                              // int128 ?
                         size = 5;
-                        ret = new CastExpr( ret, new BasicType( Type::Qualifiers(), kind[Unsigned][size] ) );
+                        ret = new CastExpr( ret, new BasicType( Type::Qualifiers(), kind[Unsigned][size] ), false );
                 } else {
-                        ret = new CastExpr( ret, new TypeInstType( Type::Qualifiers(), lnthsInt[Unsigned][lnth], false ) );
+                        ret = new CastExpr( ret, new TypeInstType( Type::Qualifiers(), lnthsInt[Unsigned][lnth], false ), false );
                 } // if
         } // if
@@ -285 +285 @@
         Expression * ret = new ConstantExpr( Constant( new BasicType( noQualifiers, kind[complx][size] ), str, v ) );
         if ( lnth != -1 ) {                                                                     // explicit length ?
-                ret = new CastExpr( ret, new BasicType( Type::Qualifiers(), kind[complx][size] ) );
+                ret = new CastExpr( ret, new BasicType( Type::Qualifiers(), kind[complx][size] ), false );
         } // if
 
@@ -408 +408 @@
         if ( dynamic_cast< VoidType * >( targetType ) ) {
                 delete targetType;
-                return new CastExpr( maybeMoveBuild< Expression >(expr_node) );
+                return new CastExpr( maybeMoveBuild< Expression >(expr_node), false );
         } else {
-                return new CastExpr( maybeMoveBuild< Expression >(expr_node), targetType );
+                return new CastExpr( maybeMoveBuild< Expression >(expr_node), targetType, false );
         } // if
 } // build_cast
+
+Expression * build_keyword_cast( KeywordCastExpr::Target target, ExpressionNode * expr_node ) {
+        return new KeywordCastExpr( maybeMoveBuild< Expression >(expr_node), target );
+}
 
 Expression * build_virtual_cast( DeclarationNode * decl_node, ExpressionNode * expr_node ) {

src/Parser/ParseNode.h

@@ -179 +179 @@
 
 Expression * build_cast( DeclarationNode * decl_node, ExpressionNode * expr_node );
+Expression * build_keyword_cast( KeywordCastExpr::Target target, ExpressionNode * expr_node );
 Expression * build_virtual_cast( DeclarationNode * decl_node, ExpressionNode * expr_node );
 Expression * build_fieldSel( ExpressionNode * expr_node, Expression * member );

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 22 15:49:00 2018
-// Update Count     : 597
+// Last Modified On : Tue Apr 17 23:00:52 2018
+// Update Count     : 602
 //
 
@@ -395 +395 @@
                 break;
           case Builtin:
-                os << "gcc builtin type";
+                os << DeclarationNode::builtinTypeNames[builtintype];
                 break;
           default:
@@ -490 +490 @@
         switch ( td->kind ) {
           case TypeData::Aggregate:
-                if ( ! toplevel && td->aggregate.fields ) {
+                if ( ! toplevel && td->aggregate.body ) {
                         ret = td->clone();
                 } // if
                 break;
           case TypeData::Enum:
-                if ( ! toplevel && td->enumeration.constants ) {
+                if ( ! toplevel && td->enumeration.body ) {
                         ret = td->clone();
                 } // if

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar 28 17:52:24 2018
-// Update Count     : 3130
+// Last Modified On : Tue Apr 17 17:10:30 2018
+// Update Count     : 3144
 //
 
@@ -391 +391 @@
 %precedence '('
 
-%locations                      // support location tracking for error messages
+%locations                                                                                              // support location tracking for error messages
 
 %start translation_unit                                                                 // parse-tree root
@@ -688 +688 @@
                 { $$ = new ExpressionNode( build_cast( $2, $4 ) ); }
         | '(' COROUTINE '&' ')' cast_expression                         // CFA
-                { SemanticError( yylloc, "coroutine cast is currently unimplemented." ); $$ = nullptr; }
+                { $$ = new ExpressionNode( build_keyword_cast( KeywordCastExpr::Coroutine, $5 ) ); }
         | '(' THREAD '&' ')' cast_expression                            // CFA
-                { SemanticError( yylloc, "monitor cast is currently unimplemented." ); $$ = nullptr; }
+                { $$ = new ExpressionNode( build_keyword_cast( KeywordCastExpr::Thread, $5 ) ); }
         | '(' MONITOR '&' ')' cast_expression                           // CFA
-                { SemanticError( yylloc, "thread cast is currently unimplemented." ); $$ = nullptr; }
+                { $$ = new ExpressionNode( build_keyword_cast( KeywordCastExpr::Monitor, $5 ) ); }
                 // VIRTUAL cannot be opt because of look ahead issues
         | '(' VIRTUAL ')' cast_expression                                       // CFA
@@ -1708 +1708 @@
         | LONG
                 { $$ = DeclarationNode::newLength( DeclarationNode::Long ); }
-        | ZERO_T
-                { $$ = DeclarationNode::newBuiltinType( DeclarationNode::Zero ); }
-        | ONE_T
-                { $$ = DeclarationNode::newBuiltinType( DeclarationNode::One ); }
         | VALIST                                                                                        // GCC, __builtin_va_list
                 { $$ = DeclarationNode::newBuiltinType( DeclarationNode::Valist ); }
@@ -1731 +1727 @@
 basic_type_specifier:
         direct_type
+                // Cannot have type modifiers, e.g., short, long, etc.
         | type_qualifier_list_opt indirect_type type_qualifier_list_opt
                 { $$ = $2->addQualifiers( $1 )->addQualifiers( $3 ); }
@@ -1736 +1733 @@
 
 direct_type:
-                // A semantic check is necessary for conflicting type qualifiers.
         basic_type_name
         | type_qualifier_list basic_type_name
@@ -1755 +1751 @@
         | ATTR_TYPEGENname '(' comma_expression ')'                     // CFA: e.g., @type(a+b) y;
                 { $$ = DeclarationNode::newAttr( $1, $3 ); }
+        | ZERO_T                                                                                        // CFA
+                { $$ = DeclarationNode::newBuiltinType( DeclarationNode::Zero ); }
+        | ONE_T                                                                                         // CFA
+                { $$ = DeclarationNode::newBuiltinType( DeclarationNode::One ); }
         ;