Merge pull request #85 from seq-lang/develop

Develop

Author: arshajii

.travis.yml

@@ -13,6 +13,7 @@ addons:
       - libsnappy-dev
       - binutils-dev
       - libomp-dev
+      - libunwind-dev
       - texinfo
       - python3
       - python3-pip
@@ -48,7 +49,7 @@ before_install:
                -DLLVM_ENABLE_RTTI=ON \
                -DCMAKE_BUILD_TYPE=Release \
                -DLLVM_TARGETS_TO_BUILD=host
-      cmake --build .
+      cmake --build . --config Release
       cd -
     fi
 
@@ -93,7 +94,7 @@ install:
   # install htslib:
   - wget -c https://github.com/samtools/htslib/releases/download/1.9/htslib-1.9.tar.bz2 -O - | tar -xj
   - cd htslib-1.9
-  - ./configure CFLAGS="-fPIC" --disable-libcurl
+  - ./configure CFLAGS="-fPIC" --disable-libcurl --without-curses
   - make
   - sudo make install
   - cd -

CMakeLists.txt

@@ -133,6 +133,7 @@ add_library(seq SHARED compiler/include/seq/any.h
                        compiler/include/seq/optional.h
                        compiler/include/seq/parser.h
                        compiler/include/seq/patterns.h
+                       compiler/include/seq/pipeline.h
                        compiler/include/seq/ptr.h
                        compiler/include/seq/record.h
                        compiler/include/seq/ref.h
@@ -147,6 +148,7 @@ add_library(seq SHARED compiler/include/seq/any.h
                        compiler/lang/lang.cpp
                        compiler/lang/ops.cpp
                        compiler/lang/patterns.cpp
+                       compiler/lang/pipeline.cpp
                        compiler/lang/seq.cpp
                        compiler/lang/stmt.cpp
                        compiler/lang/var.cpp

compiler/include/seq/expr.h

@@ -298,6 +298,7 @@ class FuncExpr : public Expr {
   FuncExpr(BaseFunc *func, Expr *orig, std::vector<types::Type *> types = {});
   explicit FuncExpr(BaseFunc *func, std::vector<types::Type *> types = {});
   BaseFunc *getFunc();
+  std::vector<types::Type *> getTypes() const;
   bool isRealized() const;
   void setRealizeTypes(std::vector<types::Type *> types);
   void resolveTypes() override;
@@ -481,6 +482,7 @@ class CallExpr : public Expr {
   CallExpr(Expr *func, std::vector<Expr *> args,
            std::vector<std::string> names = {});
   Expr *getFuncExpr() const;
+  std::vector<Expr *> getArgs() const;
   void setFuncExpr(Expr *func);
   void resolveTypes() override;
   llvm::Value *codegen0(BaseFunc *base, llvm::BasicBlock *&block) override;
@@ -498,6 +500,7 @@ class PartialCallExpr : public Expr {
   PartialCallExpr(Expr *func, std::vector<Expr *> args,
                   std::vector<std::string> names = {});
   Expr *getFuncExpr() const;
+  std::vector<Expr *> getArgs() const;
   void setFuncExpr(Expr *func);
   void resolveTypes() override;
   llvm::Value *codegen0(BaseFunc *base, llvm::BasicBlock *&block) override;
@@ -593,22 +596,6 @@ class TypeOfExpr : public Expr {
   TypeOfExpr *clone(Generic *ref) override;
 };
 
-class PipeExpr : public Expr {
-private:
-  std::vector<Expr *> stages;
-  std::vector<bool> parallel;
-
-public:
-  static const unsigned SCHED_WIDTH = 16;
-  explicit PipeExpr(std::vector<Expr *> stages,
-                    std::vector<bool> parallel = {});
-  void setParallel(unsigned which);
-  void resolveTypes() override;
-  llvm::Value *codegen0(BaseFunc *base, llvm::BasicBlock *&block) override;
-  types::Type *getType0() const override;
-  PipeExpr *clone(Generic *ref) override;
-};
-
 } // namespace seq
 
 #endif /* SEQ_EXPR_H */

compiler/include/seq/func.h

@@ -6,6 +6,7 @@
 #include "generic.h"
 #include "stmt.h"
 #include "types.h"
+#include <unordered_map>
 
 namespace seq {
 class Expr;
@@ -52,6 +53,9 @@ class BaseFunc {
  */
 class Func : public BaseFunc, public Generic, public SrcObject {
 private:
+  /// Cache of built-in functions
+  static std::unordered_map<std::string, Func *> builtins;
+
   /// Whether this function is externally-defined (e.g. via `cdef`)
   bool external;
 
@@ -172,6 +176,8 @@ class Func : public BaseFunc, public Generic, public SrcObject {
   void setArgNames(std::vector<std::string> argNames);
 
   Func *clone(Generic *ref) override;
+
+  static Func *getBuiltin(const std::string &name);
 };
 
 /**

compiler/include/seq/generic.h

@@ -22,10 +22,12 @@ static bool typeMatch(const std::vector<T *> &v1, const std::vector<T *> &v2,
 
   for (unsigned i = 0; i < v1.size(); i++) {
     if (strict) {
-      types::RecordType *r1 = v1[i]->asRec();
-      types::RecordType *r2 = v2[i]->asRec();
+      auto *r1 = dynamic_cast<types::RecordType *>(v1[i]);
+      auto *r2 = dynamic_cast<types::RecordType *>(v2[i]);
       if (r1 && r2) {
-        return r1->isStrict(r2);
+        if (!r1->isStrict(r2))
+          return false;
+        continue;
       }
     }
     if (!types::is(v1[i], v2[i]))
@@ -43,19 +45,28 @@ static bool typeMatch(const std::vector<T *> &v1, const std::vector<T *> &v2,
 template <typename T> class RCache {
 private:
   std::vector<std::pair<std::vector<types::Type *>, T *>> cache;
+  std::vector<std::vector<types::Type *>> inProgress;
 
 public:
-  RCache() : cache() {}
+  RCache() : cache(), inProgress() {}
 
   void add(std::vector<types::Type *> types, T *t) {
     cache.emplace_back(std::move(types), t);
   }
 
   T *find(const std::vector<types::Type *> &types) {
+    for (auto &v : inProgress) {
+      if (v == types)
+        return nullptr;
+    }
+    inProgress.push_back(types);
     for (auto &v : cache) {
-      if (typeMatch<>(v.first, types, /*strict=*/true))
+      if (typeMatch<>(v.first, types, /*strict=*/true)) {
+        inProgress.pop_back();
         return v.second;
+      }
     }
+    inProgress.pop_back();
     return nullptr;
   }
 };
@@ -150,7 +161,8 @@ class GenericType : public Type {
   void initOps() override;
   void initFields() override;
   Type *magicOut(const std::string &name, std::vector<Type *> args,
-                 bool nullOnMissing = false) override;
+                 bool nullOnMissing = false,
+                 bool overloadsOnly = false) override;
   llvm::Value *callMagic(const std::string &name, std::vector<Type *> argTypes,
                          llvm::Value *self, std::vector<llvm::Value *> args,
                          llvm::BasicBlock *&block, TryCatch *tc) override;

compiler/include/seq/pipeline.h

@@ -0,0 +1,26 @@
+#ifndef SEQ_PIPELINE_H
+#define SEQ_PIPELINE_H
+
+#include "expr.h"
+
+namespace seq {
+
+class PipeExpr : public Expr {
+private:
+  std::vector<Expr *> stages;
+  std::vector<bool> parallel;
+
+public:
+  static const unsigned SCHED_WIDTH = 16;
+  explicit PipeExpr(std::vector<Expr *> stages,
+                    std::vector<bool> parallel = {});
+  void setParallel(unsigned which);
+  void resolveTypes() override;
+  llvm::Value *codegen0(BaseFunc *base, llvm::BasicBlock *&block) override;
+  types::Type *getType0() const override;
+  PipeExpr *clone(Generic *ref) override;
+};
+
+} // namespace seq
+
+#endif /* SEQ_PIPELINE_H */

compiler/include/seq/record.h

@@ -21,6 +21,7 @@ class RecordType : public Type {
   void operator=(RecordType const &) = delete;
 
   void setContents(std::vector<Type *> types, std::vector<std::string> names);
+  bool named() const;
   bool empty() const;
   std::vector<Type *> getTypes();
 

compiler/include/seq/seq.h

@@ -13,6 +13,7 @@
 #include "lang.h"
 #include "ops.h"
 #include "patterns.h"
+#include "pipeline.h"
 #include "var.h"
 
 #include "any.h"
@@ -34,7 +35,7 @@
 
 #define SEQ_VERSION_MAJOR 0
 #define SEQ_VERSION_MINOR 9
-#define SEQ_VERSION_PATCH 1
+#define SEQ_VERSION_PATCH 2
 
 namespace seq {
 namespace types {

compiler/include/seq/types.h

@@ -227,7 +227,8 @@ class Type {
   ///                      exception if magic is missing
   /// @return output type of specified magic method
   virtual Type *magicOut(const std::string &name, std::vector<Type *> args,
-                         bool nullOnMissing = false);
+                         bool nullOnMissing = false,
+                         bool overloadsOnly = false);
 
   /// Codegens a call to the specified magic method. Throws
   /// an exception if the specified magic method does not