Changeset 1b772749 for src/Parser

Timestamp:

Sep 16, 2016, 10:48:28 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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

Children:

2298f728

Parents:

ba7aa2d

Message:

more refactoring of parser code

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (2 diffs)
• ExpressionNode.cc (modified) (2 diffs)
• ParseNode.h (modified) (9 diffs)
• TypeData.cc (modified) (3 diffs)
• TypeData.h (modified) (3 diffs)
• parser.yy (modified) (10 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 Sep 15 23:36:02 2016
-// Update Count     : 515
+// Last Modified On : Fri Sep 16 18:17:16 2016
+// Update Count     : 527
 //
 
@@ -447 +447 @@
         copyStorageClasses( q );
 
-        if ( ! q->type ) { delete q; return this; }
+        if ( ! q->type ) {
+                delete q;
+                return this;
+        } // if
 
         if ( ! type ) {
-//              type = new TypeData;
-                type = q->type;
+                type = q->type;                                                                 // reuse this structure
+                q->type = nullptr;
+                delete q;
                 return this;
         } // if

src/Parser/ExpressionNode.cc ¶

@@ -10 +10 @@
 // Created On       : Sat May 16 13:17:07 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 25 21:39:40 2016
-// Update Count     : 503
+// Last Modified On : Fri Sep 16 16:27:44 2016
+// Update Count     : 508
 //
 
@@ -31 +31 @@
 
 using namespace std;
-
-ExpressionNode::ExpressionNode( const ExpressionNode &other ) : ParseNode( other.get_name() ), extension( other.extension ) {}
 
 //##############################################################################

src/Parser/ParseNode.h ¶

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Sep 12 08:00:05 2016
-// Update Count     : 603
+// Last Modified On : Fri Sep 16 15:02:38 2016
+// Update Count     : 613
 //
 
@@ -41 +41 @@
   public:
         ParseNode() {};
-        ParseNode( const std::string * name ) : name( * name ) { assert( false ); delete name; }
-        ParseNode( const std::string &name ) : name( name ) { assert( false ); }
         virtual ~ParseNode() { delete next; };
         virtual ParseNode * clone() const = 0;
@@ -48 +46 @@
         ParseNode * get_next() const { return next; }
         ParseNode * set_next( ParseNode * newlink ) { next = newlink; return this; }
+
         ParseNode * get_last() {
                 ParseNode * current;
@@ -58 +57 @@
         }
 
-        const std::string &get_name() const { return name; }
-        void set_name( const std::string &newValue ) { name = newValue; }
-
         virtual void print( std::ostream &os, int indent = 0 ) const {}
         virtual void printList( std::ostream &os, int indent = 0 ) const {}
-  private:
+
         static int indent_by;
 
@@ -106 +102 @@
   public:
         ExpressionNode( Expression * expr = nullptr ) : expr( expr ) {}
-        ExpressionNode( Expression * expr, const std::string * name ) : ParseNode( name ), expr( expr ) {}
         ExpressionNode( const ExpressionNode &other );
         virtual ~ExpressionNode() {}
@@ -286 +281 @@
 
         bool get_hasEllipsis() const;
-        const std::string &get_name() const { return name; }
         LinkageSpec::Spec get_linkage() const { return linkage; }
         DeclarationNode * extractAggregate() const;
@@ -295 +289 @@
         DeclarationNode * set_extension( bool exten ) { extension = exten; return this; }
   public:
-        // StorageClass buildStorageClass() const;
-        // bool buildFuncSpecifier( StorageClass key ) const;
-
         struct Variable_t {
                 DeclarationNode::TypeClass tyClass;
@@ -315 +306 @@
 
         TypeData * type;
-        std::string name;
         StorageClass storageClass;
         bool isInline, isNoreturn;
@@ -331 +321 @@
 
 Type * buildType( TypeData * type );
-//Type::Qualifiers buildQualifiers( const TypeData::Qualifiers & qualifiers );
 
 static inline Type * maybeMoveBuildType( const DeclarationNode * orig ) {

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 Sep 15 23:05:01 2016
-// Update Count     : 384
+// Last Modified On : Fri Sep 16 15:12:55 2016
+// Update Count     : 388
 //
 
@@ -763 +763 @@
 } // buildTypeof
 
-AttrType * buildAttr( const TypeData * td ) {
-        assert( false );
-        return nullptr;
-        // assert( td->kind == TypeData::Attr );
-        // // assert( td->attr );
-        // AttrType * ret;
-        // if ( td->attr.expr ) {
-        //      ret = new AttrType( buildQualifiers( td ), td->attr.name, td->attr.expr->build() );
-        // } else {
-        //      assert( td->attr.type );
-        //      ret = new AttrType( buildQualifiers( td ), td->attr.name, td->attr.type->buildType() );
-        // } // if
-        // return ret;
-} // buildAttr
-
 Declaration * buildDecl( const TypeData * td, std::string name, DeclarationNode::StorageClass sc, Expression * bitfieldWidth, bool isInline, bool isNoreturn, LinkageSpec::Spec linkage, Initializer * init ) {
         if ( td->kind == TypeData::Function ) {
@@ -795 +780 @@
                 } // if
                 for ( DeclarationNode * cur = td->function.idList; cur != 0; cur = dynamic_cast< DeclarationNode* >( cur->get_next() ) ) {
-                        if ( cur->get_name() != "" ) {
-                                decl->get_oldIdents().insert( decl->get_oldIdents().end(), cur->get_name() );
+                        if ( cur->name != "" ) {
+                                decl->get_oldIdents().insert( decl->get_oldIdents().end(), cur->name );
                         } // if
                 } // for

src/Parser/TypeData.h ¶

@@ -10 +10 @@
 // Created On       : Sat May 16 15:18:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Sep 12 17:15:49 2016
-// Update Count     : 129
+// Last Modified On : Fri Sep 16 15:17:31 2016
+// Update Count     : 131
 //
 
@@ -88 +88 @@
                 DeclarationNode * tuple;
                 ExpressionNode * typeexpr;
-                // Attr_t attr;
                 // DeclarationNode::BuiltinType builtin;
 
@@ -111 +110 @@
 TupleType * buildTuple( const TypeData * );
 TypeofType * buildTypeof( const TypeData * );
-AttrType * buildAttr( const TypeData * );
 Declaration * buildDecl( const TypeData *, std::string, DeclarationNode::StorageClass, Expression *, bool isInline, bool isNoreturn, LinkageSpec::Spec, Initializer * init = 0 );
 FunctionType * buildFunction( const TypeData * );

src/Parser/parser.yy ¶

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Sep 12 17:29:45 2016
-// Update Count     : 1969
+// Last Modified On : Fri Sep 16 18:12:21 2016
+// Update Count     : 1978
 //
 
@@ -359 +359 @@
                 { $$ = $2; }
         | '(' compound_statement ')'                                            // GCC, lambda expression
-        { $$ = new ExpressionNode( build_valexpr( $2 ) ); }
+                { $$ = new ExpressionNode( build_valexpr( $2 ) ); }
         ;
 
@@ -896 +896 @@
                 { $$ = new StatementNode( build_catch( $5, $8 ) ); }
         | handler_clause CATCH '(' push push exception_declaration pop ')' compound_statement pop
-        { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $6, $9 ) ) ); }
+                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $6, $9 ) ) ); }
         | CATCHRESUME '(' push push exception_declaration pop ')' compound_statement pop
                 { $$ = new StatementNode( build_catch( $5, $8 ) ); }
@@ -968 +968 @@
                 { $$ = new ExpressionNode( build_asmexpr( 0, $1, $3 ) ); }
         | '[' constant_expression ']' string_literal '(' constant_expression ')'
-        { $$ = new ExpressionNode( build_asmexpr( $2, $4, $6 ) ); }
+                { $$ = new ExpressionNode( build_asmexpr( $2, $4, $6 ) ); }
         ;
 
@@ -1467 +1467 @@
 aggregate_name:
         aggregate_key '{' field_declaration_list '}'
-                { $$ = DeclarationNode::newAggregate( $1, 0, 0, $3, true ); }
+                { $$ = DeclarationNode::newAggregate( $1, new std::string( "" ), nullptr, $3, true ); }
         | aggregate_key no_attr_identifier_or_type_name
                 {
@@ -1476 +1476 @@
                 { typedefTable.makeTypedef( *$2 ); }
                 '{' field_declaration_list '}'
-                { $$ = DeclarationNode::newAggregate( $1, $2, 0, $5, true ); }
+                { $$ = DeclarationNode::newAggregate( $1, $2, nullptr, $5, true ); }
         | aggregate_key '(' type_name_list ')' '{' field_declaration_list '}' // CFA
-                { $$ = DeclarationNode::newAggregate( $1, 0, $3, $6, false ); }
+                { $$ = DeclarationNode::newAggregate( $1, new std::string( "" ), $3, $6, false ); }
         | aggregate_key typegen_name                                            // CFA, S/R conflict
                 { $$ = $2; }
@@ -1559 +1559 @@
 enum_name:
         enum_key '{' enumerator_list comma_opt '}'
-                { $$ = DeclarationNode::newEnum( 0, $3 ); }
+                { $$ = DeclarationNode::newEnum( new std::string( "" ), $3 ); }
         | enum_key no_attr_identifier_or_type_name
                 {
@@ -2520 +2520 @@
 abstract_function:
         '(' push parameter_type_list_opt pop ')'                        // empty parameter list OBSOLESCENT (see 3)
-                { $$ = DeclarationNode::newFunction( 0, 0, $3, 0 ); }
+                { $$ = DeclarationNode::newFunction( new std::string( "" ), nullptr, $3, nullptr ); }
         | '(' abstract_ptr ')' '(' push parameter_type_list_opt pop ')' // empty parameter list OBSOLESCENT (see 3)
                 { $$ = $2->addParamList( $6 ); }
@@ -2589 +2589 @@
 abstract_parameter_function:
         '(' push parameter_type_list_opt pop ')'                        // empty parameter list OBSOLESCENT (see 3)
-                { $$ = DeclarationNode::newFunction( 0, 0, $3, 0 ); }
+                { $$ = DeclarationNode::newFunction( new std::string( "" ), nullptr, $3, nullptr ); }
         | '(' abstract_parameter_ptr ')' '(' push parameter_type_list_opt pop ')' // empty parameter list OBSOLESCENT (see 3)
                 { $$ = $2->addParamList( $6 ); }
@@ -2813 +2813 @@
 new_abstract_function:                                                                  // CFA
         '[' ']' '(' new_parameter_type_list_opt ')'
-                { $$ = DeclarationNode::newFunction( 0, DeclarationNode::newTuple( 0 ), $4, 0 ); }
+        { $$ = DeclarationNode::newFunction( new std::string( "" ), DeclarationNode::newTuple( nullptr ), $4, nullptr ); }
         | new_abstract_tuple '(' push new_parameter_type_list_opt pop ')'
-                { $$ = DeclarationNode::newFunction( 0, $1, $4, 0 ); }
+                { $$ = DeclarationNode::newFunction( new std::string( "" ), $1, $4, nullptr ); }
         | new_function_return '(' push new_parameter_type_list_opt pop ')'
-                { $$ = DeclarationNode::newFunction( 0, $1, $4, 0 ); }
+                { $$ = DeclarationNode::newFunction( new std::string( "" ), $1, $4, nullptr ); }
         ;