Changeset 7880579 for src/Parser/ParseNode.h

Timestamp:

Aug 16, 2016, 8:59:49 AM (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, 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:

0da3e2c, 13e3b50, 7527e63

Parents:

b1848a0

Message:

more refactoring of parser code

File:

• src/Parser/ParseNode.h (modified) (14 diffs)

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 Aug 15 14:52:12 2016
-// Update Count     : 512
+// Last Modified On : Tue Aug 16 08:37:47 2016
+// Update Count     : 527
 //
 
@@ -22 +22 @@
 #include <memory>
 
-#include "Common/utility.h"
 #include "Parser/LinkageSpec.h"
 #include "SynTree/Type.h"
 #include "SynTree/Expression.h"
 #include "SynTree/Statement.h"
-//#include "SynTree/Declaration.h"
+#include "SynTree/Label.h"
+#include "Common/utility.h"
 #include "Common/UniqueName.h"
-#include "SynTree/Label.h"
 
 class StatementNode;
@@ -37 +36 @@
 class InitializerNode;
 
-// Builder
+//##############################################################################
+
 class ParseNode {
   public:
@@ -44 +44 @@
         ParseNode( const std::string & );                                       // for copy constructing subclasses
         virtual ~ParseNode();
+        virtual ParseNode *clone() const { assert( false ); return nullptr; };
 
         ParseNode *get_next() const { return next; }
@@ -50 +51 @@
         ParseNode *set_last( ParseNode * );
 
-        virtual ParseNode *clone() const { return 0; };
-
         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 print( std::ostream &os, int indent = 0 ) const {}
         virtual void printList( std::ostream &os, int indent = 0 ) const;
-
-        ParseNode &operator,( ParseNode & );
-  protected:
+  private:
+        static int indent_by;
+
+        ParseNode *next;
         std::string name;
-        static int indent_by;
-        ParseNode *next;
-};
+}; // ParseNode
 
 //##############################################################################
@@ -104 +102 @@
         virtual ~ExpressionNode() {}
 
-        virtual ExpressionNode *clone() const { return 0; }
+        virtual ExpressionNode *clone() const { assert( false ); return nullptr; }
 
         bool get_extension() const { return extension; }
@@ -119 +117 @@
 
 template< typename T >
-struct maybeBuild_t<Expression, T> {
+struct maybeBuild_t< Expression, T > {
         static inline Expression * doit( const T *orig ) {
                 if ( orig ) {
@@ -126 +124 @@
                         return p;
                 } else {
-                        return 0;
+                        return nullptr;
                 } // if
         }
@@ -228 +226 @@
         static DeclarationNode *newBuiltinType( BuiltinType );
 
+        DeclarationNode();
+        ~DeclarationNode();
+        DeclarationNode *clone() const;
+
         DeclarationNode *addQualifiers( DeclarationNode *);
         DeclarationNode *copyStorageClasses( DeclarationNode *);
@@ -254 +256 @@
         DeclarationNode *appendList( DeclarationNode * );
 
-        DeclarationNode *clone() const;
         void print( std::ostream &os, int indent = 0 ) const;
         void printList( std::ostream &os, int indent = 0 ) const;
@@ -269 +270 @@
         bool get_extension() const { return extension; }
         DeclarationNode *set_extension( bool exten ) { extension = exten; return this; }
-
-        DeclarationNode();
-        ~DeclarationNode();
   private:
         StorageClass buildStorageClass() const;
@@ -351 +349 @@
 void buildList( const NodeType *firstNode, std::list< SynTreeType * > &outputList ) {
         SemanticError errors;
-        std::back_insert_iterator< std::list< SynTreeType *> > out( outputList );
+        std::back_insert_iterator< std::list< SynTreeType * > > out( outputList );
         const NodeType *cur = firstNode;
 
         while ( cur ) {
                 try {
-//                      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 ) );
+//                      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;
@@ -365 +363 @@
                         errors.append( e );
                 } // try
-                cur = dynamic_cast< NodeType *>( cur->get_next() );
+                cur = dynamic_cast< NodeType * >( cur->get_next() );
         } // while
         if ( ! errors.isEmpty() ) {
@@ -374 +372 @@
 // in DeclarationNode.cc
 void buildList( const DeclarationNode *firstNode, std::list< Declaration * > &outputList );
-void buildList( const DeclarationNode *firstNode, std::list< DeclarationWithType *> &outputList );
+void buildList( const DeclarationNode *firstNode, std::list< DeclarationWithType * > &outputList );
 void buildTypeList( const DeclarationNode *firstNode, std::list< Type * > &outputList );