Changeset e04ef3a for src/Parser

Timestamp:

Jun 14, 2016, 12:53:03 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

c8c03683

Parents:

55ba733

Message:

add gcc extension, first attempt, not done yet

Location:

src/Parser

Files:

• ExpressionNode.cc (modified) (10 diffs)
• ParseNode.h (modified) (6 diffs)
• StatementNode.cc (modified) (4 diffs)
• parser.cc (modified) (5 diffs)
• parser.yy (modified) (5 diffs)

src/Parser/ExpressionNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 13:17:07 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Apr  8 15:43:05 2016
-// Update Count     : 296
+// Last Modified On : Mon Jun 13 14:46:17 2016
+// Update Count     : 307
 // 
 
@@ -32 +32 @@
 using namespace std;
 
-ExpressionNode::ExpressionNode() : ParseNode(), argName( 0 ) {}
-
-ExpressionNode::ExpressionNode( const string *name ) : ParseNode( name ), argName( 0 ) {}
-
-ExpressionNode::ExpressionNode( const ExpressionNode &other ) : ParseNode( other.name ) {
+ExpressionNode::ExpressionNode() : ParseNode() {}
+
+ExpressionNode::ExpressionNode( const string *name ) : ParseNode( name ) {}
+
+ExpressionNode::ExpressionNode( const ExpressionNode &other ) : ParseNode( other.name ), extension( other.extension ) {
         if ( other.argName ) {
                 argName = other.argName->clone();
@@ -344 +344 @@
 
 Expression *DesignatorNode::build() const {
-        Expression * ret = get_argName()->build();
+        Expression * ret = maybeBuild<Expression>(get_argName());
 
         if ( isArrayIndex ) {
@@ -389 +389 @@
         "Cond", "NCond",
         // diadic
-        "SizeOf", "AlignOf", "OffsetOf", "Attr", "CompLit", "?+?", "?-?", "?*?", "?/?", "?%?", "||", "&&",
+        "SizeOf", "AlignOf", "OffsetOf", "Attr", "?+?", "?-?", "?*?", "?/?", "?%?", "||", "&&",
         "?|?", "?&?", "?^?", "Cast", "?<<?", "?>>?", "?<?", "?>?", "?<=?", "?>=?", "?==?", "?!=?",
         "?=?", "?*=?", "?/=?", "?%=?", "?+=?", "?-=?", "?<<=?", "?>>=?", "?&=?", "?^=?", "?|=?",
@@ -466 +466 @@
 
         if ( ! ( op = dynamic_cast<OperatorNode *>( function ) ) ) { // function as opposed to operator
-                return new UntypedExpr( function->build(), args, maybeBuild< Expression >( get_argName() ));
+                return new UntypedExpr( maybeBuild<Expression>(function), args, maybeBuild< Expression >( get_argName() ));
         } // if
 
@@ -550 +550 @@
                         if ( dynamic_cast< VoidType* >( targetType ) ) {
                                 delete targetType;
-                                return new CastExpr( expr_node->build(), maybeBuild< Expression >( get_argName() ) );
+                                return new CastExpr( maybeBuild<Expression>(expr_node), maybeBuild< Expression >( get_argName() ) );
                         } else {
-                                return new CastExpr( expr_node->build(),targetType, maybeBuild< Expression >( get_argName() ) );
+                                return new CastExpr( maybeBuild<Expression>(expr_node),targetType, maybeBuild< Expression >( get_argName() ) );
                         } // if
                 }
@@ -621 +621 @@
                         assert( var );
                         if ( ! get_args()->get_link() ) {
-                                return new AttrExpr( var->build(), ( Expression*)0);
+                                return new AttrExpr( maybeBuild<Expression>(var), ( Expression*)0);
                         } else if ( TypeValueNode * arg = dynamic_cast<TypeValueNode *>( get_args()->get_link()) ) {
-                                return new AttrExpr( var->build(), arg->get_decl()->buildType());
+                                return new AttrExpr( maybeBuild<Expression>(var), arg->get_decl()->buildType());
                         } else {
-                                return new AttrExpr( var->build(), args.back());
-                        } // if
-                }
-          case OperatorNode::CompLit:
-                throw UnimplementedError( "C99 compound literals" );
-                // the short-circuited operators
+                                return new AttrExpr( maybeBuild<Expression>(var), args.back());
+                        } // if
+                }
           case OperatorNode::Or:
           case OperatorNode::And:
@@ -719 +716 @@
 
 Expression *AsmExprNode::build() const {
-        return new AsmExpr( maybeBuild< Expression >( inout ), (ConstantExpr *)constraint->build(), operand->build() );
+        return new AsmExpr( maybeBuild< Expression >( inout ), (ConstantExpr *)maybeBuild<Expression>(constraint), maybeBuild<Expression>(operand) );
 }
 
@@ -796 +793 @@
 
 Expression *ValofExprNode::build() const {
-        return new UntypedValofExpr ( get_body()->build(), maybeBuild< Expression >( get_argName() ) );
+        return new UntypedValofExpr ( maybeBuild<Statement>(get_body()), maybeBuild< Expression >( get_argName() ) );
 }
 
@@ -908 +905 @@
 
 Expression *CompoundLiteralNode::build() const {
-        Declaration * newDecl = type->build();                          // compound literal type
+        Declaration * newDecl = maybeBuild<Declaration>(type); // compound literal type
         if ( DeclarationWithType * newDeclWithType = dynamic_cast< DeclarationWithType * >( newDecl ) ) { // non-sue compound-literal type
-                return new CompoundLiteralExpr( newDeclWithType->get_type(), kids->build() );
+                return new CompoundLiteralExpr( newDeclWithType->get_type(), maybeBuild<Initializer>(kids) );
         // these types do not have associated type information
         } else if ( StructDecl * newDeclStructDecl = dynamic_cast< StructDecl * >( newDecl )  ) {
-                return new CompoundLiteralExpr( new StructInstType( Type::Qualifiers(), newDeclStructDecl->get_name() ), kids->build() );
+                return new CompoundLiteralExpr( new StructInstType( Type::Qualifiers(), newDeclStructDecl->get_name() ), maybeBuild<Initializer>(kids) );
         } else if ( UnionDecl * newDeclUnionDecl = dynamic_cast< UnionDecl * >( newDecl )  ) {
-                return new CompoundLiteralExpr( new UnionInstType( Type::Qualifiers(), newDeclUnionDecl->get_name() ), kids->build() );
+                return new CompoundLiteralExpr( new UnionInstType( Type::Qualifiers(), newDeclUnionDecl->get_name() ), maybeBuild<Initializer>(kids) );
         } else if ( EnumDecl * newDeclEnumDecl = dynamic_cast< EnumDecl * >( newDecl )  ) {
-                return new CompoundLiteralExpr( new EnumInstType( Type::Qualifiers(), newDeclEnumDecl->get_name() ), kids->build() );
+                return new CompoundLiteralExpr( new EnumInstType( Type::Qualifiers(), newDeclEnumDecl->get_name() ), maybeBuild<Initializer>(kids) );
         } else {
                 assert( false );

src/Parser/ParseNode.h

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:28:16 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Thu Apr 14 15:37:52 2016
-// Update Count     : 205
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Jun 13 16:04:47 2016
+// Update Count     : 240
 //
 
@@ -20 +20 @@
 #include <list>
 #include <iterator>
+#include <memory>
 
 #include "Common/utility.h"
 #include "Parser/LinkageSpec.h"
 #include "SynTree/Type.h"
+#include "SynTree/Expression.h"
 //#include "SynTree/Declaration.h"
 #include "Common/UniqueName.h"
@@ -79 +81 @@
         ExpressionNode *set_argName( const std::string *aName );
         ExpressionNode *set_argName( ExpressionNode *aDesignator );
+        bool get_extension() const { return extension; }
+        ExpressionNode *set_extension( bool exten ) { extension = exten; return this; }
 
         virtual void print( std::ostream &, int indent = 0) const = 0;
@@ -87 +91 @@
         void printDesignation ( std::ostream &, int indent = 0) const;
   private:
-        ExpressionNode *argName;
+        ExpressionNode *argName = 0;
+        bool extension = false;
+};
+
+template< typename T >
+struct maybeBuild_t<Expression, T> {
+        static inline Expression * doit( const T *orig ) {
+                if ( orig ) {
+                        Expression *p = orig->build();
+                        p->set_extension( orig->get_extension() );
+                        return p;
+                } else {
+                        return 0;
+                } // if
+        }
 };
 
@@ -179 +197 @@
                                 Cond, NCond,
                                 // diadic
-                                SizeOf, AlignOf, OffsetOf, Attr, CompLit, Plus, Minus, Mul, Div, Mod, Or, And,
+                                SizeOf, AlignOf, OffsetOf, Attr, Plus, Minus, Mul, Div, Mod, Or, And,
                                 BitOr, BitAnd, Xor, Cast, LShift, RShift, LThan, GThan, LEThan, GEThan, Eq, Neq,
                                 Assign, MulAssn, DivAssn, ModAssn, PlusAssn, MinusAssn, LSAssn, RSAssn, AndAssn, ERAssn, OrAssn,
@@ -574 +592 @@
         while ( cur ) {
                 try {
-                        SynTreeType *result = dynamic_cast< SynTreeType *>( cur->build() );
+//                      SynTreeType *result = dynamic_cast< SynTreeType *>( maybeBuild<typename std::result_of<decltype(&NodeType::build)(NodeType)>::type>( cur ) );
+                        SynTreeType *result = dynamic_cast< SynTreeType *>( maybeBuild<typename std::pointer_traits<decltype(cur->build())>::element_type>( cur ) );
                         if ( result ) {
                                 *out++ = result;

src/Parser/StatementNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 14:59:41 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 30 14:39:39 2015
-// Update Count     : 130
+// Last Modified On : Thu Jun  9 14:18:46 2016
+// Update Count     : 132
 //
 
@@ -222 +222 @@
                                 branches.pop_front();
                         } // if
-                        return new IfStmt( labs, notZeroExpr( get_control()->build() ), thenb, elseb );
+                        return new IfStmt( labs, notZeroExpr( maybeBuild<Expression>(get_control()) ), thenb, elseb );
                 }
           case While:
                 assert( branches.size() == 1 );
-                return new WhileStmt( labs, notZeroExpr( get_control()->build() ), branches.front() );
+                return new WhileStmt( labs, notZeroExpr( maybeBuild<Expression>(get_control()) ), branches.front() );
           case Do:
                 assert( branches.size() == 1 );
-                return new WhileStmt( labs, notZeroExpr( get_control()->build() ), branches.front(), true );
+                return new WhileStmt( labs, notZeroExpr( maybeBuild<Expression>(get_control()) ), branches.front(), true );
           case For:
                 {
@@ -244 +244 @@
                         Expression *cond = 0;
                         if ( ctl->get_condition() != 0 )
-                                cond = notZeroExpr( ctl->get_condition()->build() );
+                                cond = notZeroExpr( maybeBuild<Expression>(ctl->get_condition()) );
 
                         Expression *incr = 0;
                         if ( ctl->get_change() != 0 )
-                                incr = ctl->get_change()->build();
+                                incr = maybeBuild<Expression>(ctl->get_change());
 
                         return new ForStmt( labs, init, cond, incr, branches.front() );
                 }
           case Switch:
-                return new SwitchStmt( labs, get_control()->build(), branches );
+                return new SwitchStmt( labs, maybeBuild<Expression>(get_control()), branches );
           case Choose:
-                return new ChooseStmt( labs, get_control()->build(), branches );
+                return new ChooseStmt( labs, maybeBuild<Expression>(get_control()), branches );
           case Fallthru:
                 return new FallthruStmt( labs );
           case Case: 
-                return new CaseStmt( labs, get_control()->build(), branches );
+                return new CaseStmt( labs, maybeBuild<Expression>(get_control()), branches );
           case Default:
                 return new CaseStmt( labs, 0, branches, true );
@@ -266 +266 @@
                         if ( get_target() == "" ) {                                     // computed goto
                                 assert( get_control() != 0 );
-                                return new BranchStmt( labs, get_control()->build(), BranchStmt::Goto );
+                                return new BranchStmt( labs, maybeBuild<Expression>(get_control()), BranchStmt::Goto );
                         } // if
 

src/Parser/parser.cc

@@ -5299 +5299 @@
 /* Line 1806 of yacc.c  */
 #line 432 "parser.yy"
-    { (yyval.en) = (yyvsp[(2) - (2)].en); }
+    { (yyval.en) = (yyvsp[(2) - (2)].en)->set_extension( true ); }
     break;
 
@@ -5809 +5809 @@
 /* Line 1806 of yacc.c  */
 #line 685 "parser.yy"
-    { (yyval.sn) = new StatementNode( (yyvsp[(2) - (2)].decl) ); }
+    { (yyval.sn) = new StatementNode( (yyvsp[(2) - (2)].decl) )/*->set_extension( true )*/; }
     break;
 
@@ -7122 +7122 @@
 /* Line 1806 of yacc.c  */
 #line 1475 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl)/*->set_extension( true )*/; }
     break;
 
@@ -7129 +7129 @@
 /* Line 1806 of yacc.c  */
 #line 1478 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl)/*->set_extension( true )*/; }
     break;
 
@@ -7913 +7913 @@
 /* Line 1806 of yacc.c  */
 #line 1994 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl); }
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)/*->set_extension( true )*/; }
     break;
 

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jun  7 08:08:31 2016
-// Update Count     : 1560
+// Last Modified On : Mon Jun 13 15:00:23 2016
+// Update Count     : 1578
 //
 
@@ -430 +430 @@
                 { $$ = $1; }
         | EXTENSION cast_expression                                                     // GCC
-                { $$ = $2; }
+                { $$ = $2->set_extension( true ); }
         | ptrref_operator cast_expression                                       // CFA
                 { $$ = new CompositeExprNode( $1, $2 ); }
@@ -683 +683 @@
                 { $$ = new StatementNode( $1 ); }
         | EXTENSION declaration                                                         // GCC
-                { $$ = new StatementNode( $2 ); }
+                { $$ = new StatementNode( $2 )/*->set_extension( true )*/; }
         | function_definition
                 { $$ = new StatementNode( $1 ); }
@@ -1473 +1473 @@
         new_field_declaring_list ';'                                            // CFA, new style field declaration
         | EXTENSION new_field_declaring_list ';'                        // GCC
-                { $$ = $2; }
+                { $$ = $2/*->set_extension( true )*/; }
         | field_declaring_list ';'
         | EXTENSION field_declaring_list ';'                            // GCC
-                { $$ = $2; }
+                { $$ = $2/*->set_extension( true )*/; }
         ;
 
@@ -1992 +1992 @@
                 }
         | EXTENSION external_definition
-                { $$ = $2; }
+                { $$ = $2/*->set_extension( true )*/; }
         ;