Changeset 99cad3aa for src

Timestamp:

Aug 18, 2016, 5:00:28 PM (9 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, 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:

5b7a60c8

Parents:

1cb2282

Message:

more refactoring of parser code

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (2 diffs)
• ParseNode.cc (modified) (2 diffs)
• ParseNode.h (modified) (3 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 : Wed Aug 17 11:08:56 2016
-// Update Count     : 180
+// Last Modified On : Wed Aug 17 23:14:51 2016
+// Update Count     : 181
 //
 
@@ -779 +779 @@
 }
 
-DeclarationNode *DeclarationNode::appendList( DeclarationNode *node ) {
-        return (DeclarationNode *)set_last( node );
-}
-
 DeclarationNode *DeclarationNode::extractAggregate() const {
         if ( type ) {

src/Parser/ParseNode.cc ¶

@@ -10 +10 @@
 // Created On       : Sat May 16 13:26:29 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Aug 16 21:31:47 2016
-// Update Count     : 125
+// Last Modified On : Wed Aug 17 23:14:16 2016
+// Update Count     : 126
 // 
 
@@ -19 +19 @@
 int ParseNode::indent_by = 4;
 
-ParseNode::ParseNode() {};
-ParseNode::ParseNode( const string *name ) : name( *name ) { assert( false ); delete name; }
-ParseNode::ParseNode( const string &name ) : name( name ) { assert( false ); }
-
-ParseNode::~ParseNode() {
-        delete next;
-};
-
-ParseNode *ParseNode::get_last() {
-        ParseNode *current;
-        for ( current = this; current->get_next() != 0; current = current->get_next() );
-        return current;
-}
-
-ParseNode *ParseNode::set_last( ParseNode *newlast ) {
-        if ( newlast != 0 ) get_last()->set_next( newlast );
-        return this;
-}
-
 // Local Variables: //
 // tab-width: 4 //

src/Parser/ParseNode.h ¶

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Aug 16 21:32:18 2016
-// Update Count     : 538
+// Last Modified On : Wed Aug 17 23:15:59 2016
+// Update Count     : 541
 //
 
@@ -40 +40 @@
 class ParseNode {
   public:
-        ParseNode();
-        ParseNode( const std::string * );
-        ParseNode( const std::string & );                                       // for copy constructing subclasses
-        virtual ~ParseNode();
+        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;
 
         ParseNode *get_next() const { return next; }
         ParseNode *set_next( ParseNode *newlink ) { next = newlink; return this; }
-        ParseNode *get_last();
-        ParseNode *set_last( ParseNode *newlast );
+        ParseNode *get_last() {
+                ParseNode *current;
+                for ( current = this; current->get_next() != 0; current = current->get_next() );
+                return current;
+        }
+        ParseNode *set_last( ParseNode *newlast ) {
+                if ( newlast != 0 ) get_last()->set_next( newlast );
+                return this;
+        }
 
         const std::string &get_name() const { return name; }
@@ -254 +261 @@
         DeclarationNode *cloneBaseType( DeclarationNode *newdecl );
 
-        DeclarationNode *appendList( DeclarationNode * );
+        DeclarationNode *appendList( DeclarationNode *node ) {
+                return (DeclarationNode *)set_last( node );
+        }
 
         void print( std::ostream &os, int indent = 0 ) const;