Changeset 54e41b3 for src/ResolvExpr

Timestamp:

May 16, 2019, 1:46:28 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

24afc53

Parents:

89c2f7c9

Message:

Add first half of ast::Expr subclasses

Location:

src/ResolvExpr

Files:

• Unify.cc (modified) (3 diffs)
• typeops.h (modified) (2 diffs)

src/ResolvExpr/Unify.cc

@@ -21 +21 @@
 #include <string>                 // for string, operator==, operator!=, bas...
 #include <utility>                // for pair, move
-
+#include <vector>
+
+#include "AST/Node.hpp"
+#include "AST/Type.hpp"
 #include "Common/PassVisitor.h"   // for PassVisitor
 #include "FindOpenVars.h"         // for findOpenVars
@@ -630 +633 @@
         }
 
-        // xxx - compute once and store in the FunctionType?
         Type * extractResultType( FunctionType * function ) {
                 if ( function->get_returnVals().size() == 0 ) {
@@ -644 +646 @@
                 }
         }
+
+        ast::ptr<ast::Type> extractResultType( const ast::FunctionType * func ) {
+                assert(!"restore after AST added to build");
+                // if ( func->returns.empty() ) return new ast::VoidType{};
+                // if ( func->returns.size() == 1 ) return func->returns[0]->get_type();
+
+                // std::vector<ast::ptr<ast::Type>> tys;
+                // for ( const ast::DeclWithType * decl : func->returns ) {
+                //      tys.emplace_back( decl->get_type() );
+                // }
+                // return new ast::TupleType{ std::move(tys) };
+        }
 } // namespace ResolvExpr
 

src/ResolvExpr/typeops.h

@@ -18 +18 @@
 #include <vector>
 
+#include "AST/Node.hpp"
+#include "AST/Type.hpp"
 #include "SynTree/SynTree.h"
 #include "SynTree/Type.h"
@@ -99 +101 @@
         /// creates the type represented by the list of returnVals in a FunctionType. The caller owns the return value.
         Type * extractResultType( FunctionType * functionType );
+        /// Creates or extracts the type represented by the list of returns in a `FunctionType`.
+        ast::ptr<ast::Type> extractResultType( const ast::FunctionType * func );
 
         // in CommonType.cc