Changeset 4f748c5 for src/SynTree

Timestamp:

Nov 2, 2017, 11:45:10 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

6de43b6

Parents:

b1e68d03 (diff), fde89cf6 (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 'fix-missing-cast-warning'

Location:

src/SynTree

Files:

• ApplicationExpr.cc (modified) (3 diffs)
• Declaration.h (modified) (3 diffs)
• Expression.cc (modified) (2 diffs)
• Expression.h (modified) (4 diffs)
• TypeDecl.cc (modified) (2 diffs)

src/SynTree/ApplicationExpr.cc

@@ -59 +59 @@
 
 ApplicationExpr::ApplicationExpr( const ApplicationExpr &other ) :
-                Expression( other ), function( maybeClone( other.function ) ), inferParams( other.inferParams ) {
+                Expression( other ), function( maybeClone( other.function ) ) {
         cloneAll( other.args, args );
 }
@@ -66 +66 @@
         delete function;
         deleteAll( args );
-}
-
-void printInferParams( const InferredParams & inferParams, std::ostream &os, Indenter indent, int level ) {
-        if ( ! inferParams.empty() ) {
-                os << indent << "with inferred parameters " << level << ":" << std::endl;
-                for ( InferredParams::const_iterator i = inferParams.begin(); i != inferParams.end(); ++i ) {
-                        os << indent+1;
-                        Declaration::declFromId( i->second.decl )->printShort( os, indent+1 );
-                        os << std::endl;
-                        printInferParams( *i->second.inferParams, os, indent+1, level+1 );
-                } // for
-        } // if
 }
 
@@ -88 +76 @@
                 printAll( args, os, indent+1 );
         } // if
-        printInferParams( inferParams, os, indent+1, 0 );
         Expression::print( os, indent );
 }

src/SynTree/Declaration.h

@@ -200 +200 @@
         typedef NamedTypeDecl Parent;
   public:
-        enum Kind { Any, Dtype, Ftype, Ttype };
+        enum Kind { Dtype, Ftype, Ttype };
 
         Type * init;
@@ -216 +216 @@
         };
 
-        TypeDecl( const std::string &name, Type::StorageClasses scs, Type *type, Kind kind, Type * init = nullptr );
+        TypeDecl( const std::string &name, Type::StorageClasses scs, Type *type, Kind kind, bool sized, Type * init = nullptr );
         TypeDecl( const TypeDecl &other );
         virtual ~TypeDecl();
@@ -225 +225 @@
         TypeDecl * set_init( Type * newValue ) { init = newValue; return this; }
 
-        bool isComplete() const { return kind == Any || sized; }
+        bool isComplete() const { return sized; }
         bool get_sized() const { return sized; }
         TypeDecl * set_sized( bool newValue ) { sized = newValue; return this; }

src/SynTree/Expression.cc

@@ -33 +33 @@
 #include "GenPoly/Lvalue.h"
 
+void printInferParams( const InferredParams & inferParams, std::ostream &os, Indenter indent, int level ) {
+        if ( ! inferParams.empty() ) {
+                os << indent << "with inferred parameters " << level << ":" << std::endl;
+                for ( InferredParams::const_iterator i = inferParams.begin(); i != inferParams.end(); ++i ) {
+                        os << indent+1;
+                        Declaration::declFromId( i->second.decl )->printShort( os, indent+1 );
+                        os << std::endl;
+                        printInferParams( *i->second.inferParams, os, indent+1, level+1 );
+                } // for
+        } // if
+}
+
 Expression::Expression() : result( 0 ), env( 0 ) {}
 
-Expression::Expression( const Expression &other ) : BaseSyntaxNode( other ), result( maybeClone( other.result ) ), env( maybeClone( other.env ) ), extension( other.extension ) {
+Expression::Expression( const Expression &other ) : BaseSyntaxNode( other ), result( maybeClone( other.result ) ), env( maybeClone( other.env ) ), extension( other.extension ), inferParams( other.inferParams ) {
 }
 
@@ -44 +56 @@
 
 void Expression::print( std::ostream &os, Indenter indent ) const {
+        printInferParams( inferParams, os, indent+1, 0 );
+
         if ( env ) {
                 os << std::endl << indent << "... with environment:" << std::endl;

src/SynTree/Expression.h

@@ -31 +31 @@
 
 
-/// Expression is the root type for all expressions
-class Expression : public BaseSyntaxNode{
-  public:
-        Type * result;
-        TypeSubstitution * env;
-        bool extension = false;
-
-        Expression();
-        Expression( const Expression & other );
-        virtual ~Expression();
-
-        Type *& get_result() { return result; }
-        const Type * get_result() const { return result; }
-        void set_result( Type * newValue ) { result = newValue; }
-
-        TypeSubstitution * get_env() const { return env; }
-        void set_env( TypeSubstitution * newValue ) { env = newValue; }
-        bool get_extension() const { return extension; }
-        Expression * set_extension( bool exten ) { extension = exten; return this; }
-
-        virtual Expression * clone() const override = 0;
-        virtual void accept( Visitor & v ) override = 0;
-        virtual Expression * acceptMutator( Mutator & m ) override = 0;
-        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
-};
-
 struct ParamEntry;
 
@@ -73 +47 @@
         Type * actualType;
         Type * formalType;
-        Expression* expr;
+        Expression * expr;
         std::unique_ptr< InferredParams > inferParams;
+};
+
+/// Expression is the root type for all expressions
+class Expression : public BaseSyntaxNode {
+  public:
+        Type * result;
+        TypeSubstitution * env;
+        bool extension = false;
+        InferredParams inferParams;
+
+        Expression();
+        Expression( const Expression & other );
+        virtual ~Expression();
+
+        Type *& get_result() { return result; }
+        const Type * get_result() const { return result; }
+        void set_result( Type * newValue ) { result = newValue; }
+
+        TypeSubstitution * get_env() const { return env; }
+        void set_env( TypeSubstitution * newValue ) { env = newValue; }
+        bool get_extension() const { return extension; }
+        Expression * set_extension( bool exten ) { extension = exten; return this; }
+
+        InferredParams & get_inferParams() { return inferParams; }
+
+        virtual Expression * clone() const override = 0;
+        virtual void accept( Visitor & v ) override = 0;
+        virtual Expression * acceptMutator( Mutator & m ) override = 0;
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 
@@ -83 +86 @@
         Expression * function;
         std::list<Expression *> args;
-        InferredParams inferParams;
 
         ApplicationExpr( Expression * function, const std::list<Expression *> & args = std::list< Expression * >() );
@@ -92 +94 @@
         void set_function( Expression * newValue ) { function = newValue; }
         std::list<Expression *>& get_args() { return args; }
-        InferredParams & get_inferParams() { return inferParams; }
 
         virtual ApplicationExpr * clone() const { return new ApplicationExpr( * this ); }

src/SynTree/TypeDecl.cc

@@ -21 +21 @@
 #include "Type.h"            // for Type, Type::StorageClasses
 
-TypeDecl::TypeDecl( const std::string &name, Type::StorageClasses scs, Type *type, Kind kind, Type * init ) : Parent( name, scs, type ), init( init ), sized( kind == Any || kind == Ttype ), kind( kind ) {
+TypeDecl::TypeDecl( const std::string &name, Type::StorageClasses scs, Type *type, Kind kind, bool sized, Type * init ) : Parent( name, scs, type ), init( init ), sized( kind == Ttype || sized ), kind( kind ) {
 }
 
@@ -32 +32 @@
 
 std::string TypeDecl::typeString() const {
-        static const std::string kindNames[] = { "type", "incomplete type", "function type", "tuple type" };
-        return (kind != Any && isComplete() ? "sized " : "") + kindNames[ kind ];
+        static const std::string kindNames[] = { "object type", "function type", "tuple type" };
+        assertf( sizeof(kindNames)/sizeof(kindNames[0]) == DeclarationNode::NoTypeClass-1, "typeString: kindNames is out of sync." );
+        assertf( kind < sizeof(kindNames)/sizeof(kindNames[0]), "TypeDecl's kind is out of bounds." );
+        return (isComplete() ? "sized " : "") + kindNames[ kind ];
 }
 
 std::string TypeDecl::genTypeString() const {
-        static const std::string kindNames[] = { "otype", "dtype", "ftype", "ttype" };
+        static const std::string kindNames[] = { "dtype", "ftype", "ttype" };
+        assertf( sizeof(kindNames)/sizeof(kindNames[0]) == DeclarationNode::NoTypeClass-1, "genTypeString: kindNames is out of sync." );
+        assertf( kind < sizeof(kindNames)/sizeof(kindNames[0]), "TypeDecl's kind is out of bounds." );
         return kindNames[ kind ];
 }