Make maps, sets, and keywords callable

jank-lang · Dec 11, 2023 · 38d7b06 · 38d7b06
1 parent 2171819
commit 38d7b06
Show file tree

Hide file tree

Showing 11 changed files with 130 additions and 14 deletions.
diff --git a/include/cpp/jank/runtime/obj/keyword.hpp b/include/cpp/jank/runtime/obj/keyword.hpp
@@ -39,6 +39,10 @@ namespace jank::runtime
     native_string const& get_name() const;
     native_string const& get_namespace() const;
 
+    /* behavior::callable */
+    object_ptr call(object_ptr) const;
+    object_ptr call(object_ptr, object_ptr) const;
+
     bool operator ==(static_object const &rhs) const;
 
     object base{ object_type::keyword };

diff --git a/include/cpp/jank/runtime/obj/persistent_array_map.hpp b/include/cpp/jank/runtime/obj/persistent_array_map.hpp
@@ -56,6 +56,10 @@ namespace jank::runtime
     /* behavior::consable */
     native_box<static_object> cons(object_ptr head) const;
 
+    /* behavior::callable */
+    object_ptr call(object_ptr) const;
+    object_ptr call(object_ptr, object_ptr) const;
+
     value_type data{};
   };
 

diff --git a/include/cpp/jank/runtime/obj/persistent_hash_map.hpp b/include/cpp/jank/runtime/obj/persistent_hash_map.hpp
@@ -66,6 +66,10 @@ namespace jank::runtime
     /* behavior::consable */
     native_box<static_object> cons(object_ptr head) const;
 
+    /* behavior::callable */
+    object_ptr call(object_ptr) const;
+    object_ptr call(object_ptr, object_ptr) const;
+
     value_type data{};
   };
 

diff --git a/include/cpp/jank/runtime/obj/set.hpp b/include/cpp/jank/runtime/obj/set.hpp
@@ -42,6 +42,9 @@ namespace jank::runtime
     /* behavior::consable */
     native_box<static_object> cons(object_ptr head) const;
 
+    /* behavior::callable */
+    object_ptr call(object_ptr) const;
+
     native_bool contains(object_ptr o) const;
 
     object base{ object_type::set };

diff --git a/src/cpp/jank/evaluate.cpp b/src/cpp/jank/evaluate.cpp
@@ -203,8 +203,38 @@ namespace jank::evaluate
             }
           }
         }
+        else if constexpr(std::same_as<T, runtime::obj::set>)
+        {
+          auto const s(expr.arg_exprs.size());
+          if(s != 1)
+          { throw std::runtime_error{ fmt::format("invalid call with {} args to: {}", s, typed_source->to_string()) }; }
+          return typed_source->call(eval(rt_ctx, jit_prc, expr.arg_exprs[0]));
+        }
+        else if constexpr
+        (
+          std::same_as<T, runtime::obj::keyword>
+          || std::same_as<T, runtime::obj::persistent_hash_map>
+          || std::same_as<T, runtime::obj::persistent_array_map>
+        )
+        {
+          auto const s(expr.arg_exprs.size());
+          switch(s)
+          {
+            case 1:
+              return typed_source->call(eval(rt_ctx, jit_prc, expr.arg_exprs[0]));
+            case 2:
+              return typed_source->call
+              (
+                eval(rt_ctx, jit_prc, expr.arg_exprs[0]),
+                eval(rt_ctx, jit_prc, expr.arg_exprs[1])
+              );
+            default:
+              throw std::runtime_error
+              { fmt::format("invalid call with {} args to: {}", s, typed_source->to_string()) };
+          }
+        }
         else
-        { throw std::runtime_error{ fmt::format("not callable: {}", typed_source->to_string()) }; }
+        { throw std::runtime_error{ fmt::format("invalid call with 0 args to: {}", expr.arg_exprs.size(), typed_source->to_string()) }; }
       },
       source
     );

diff --git a/src/cpp/jank/runtime/behavior/callable.cpp b/src/cpp/jank/runtime/behavior/callable.cpp
@@ -36,7 +36,7 @@ namespace jank::runtime
           }
         }
         else
-        { throw std::runtime_error{ fmt::format("not callable: {}", typed_source->to_string()) }; }
+        { throw std::runtime_error{ fmt::format("invalid call with 0 args to {}", typed_source->to_string()) }; }
       },
       source
     );
@@ -66,8 +66,16 @@ namespace jank::runtime
               return typed_source->call(a1);
           }
         }
+        else if constexpr
+        (
+          std::same_as<T, obj::set>
+          || std::same_as<T, obj::persistent_hash_map>
+          || std::same_as<T, obj::persistent_array_map>
+          || std::same_as<T, obj::keyword>
+        )
+        { return typed_source->call(a1); }
         else
-        { throw std::runtime_error{ fmt::format("not callable: {}", typed_source->to_string()) }; }
+        { throw std::runtime_error{ fmt::format("invalid call with 1 arg to: {}", typed_source->to_string()) }; }
       },
       source
     );
@@ -98,8 +106,15 @@ namespace jank::runtime
               return typed_source->call(a1, a2);
           }
         }
+        else if constexpr
+        (
+          std::same_as<T, obj::persistent_hash_map>
+          || std::same_as<T, obj::persistent_array_map>
+          || std::same_as<T, obj::keyword>
+        )
+        { return typed_source->call(a1, a2); }
         else
-        { throw std::runtime_error{ fmt::format("not callable: {}", typed_source->to_string()) }; }
+        { throw std::runtime_error{ fmt::format("invalid call with 2 args to: {}", typed_source->to_string()) }; }
       },
       source
     );
@@ -133,7 +148,7 @@ namespace jank::runtime
           }
         }
         else
-        { throw std::runtime_error{ fmt::format("not callable: {}", typed_source->to_string()) }; }
+        { throw std::runtime_error{ fmt::format("invalid call with 3 args to: {}", typed_source->to_string()) }; }
       },
       source
     );
@@ -169,7 +184,7 @@ namespace jank::runtime
           }
         }
         else
-        { throw std::runtime_error{ fmt::format("not callable: {}", typed_source->to_string()) }; }
+        { throw std::runtime_error{ fmt::format("invalid call with 4 args to: {}", typed_source->to_string()) }; }
       },
       source
     );
@@ -207,7 +222,7 @@ namespace jank::runtime
           }
         }
         else
-        { throw std::runtime_error{ fmt::format("not callable: {}", typed_source->to_string()) }; }
+        { throw std::runtime_error{ fmt::format("invalid call with 5 args to: {}", typed_source->to_string()) }; }
       },
       source
     );
@@ -247,7 +262,7 @@ namespace jank::runtime
           }
         }
         else
-        { throw std::runtime_error{ fmt::format("not callable: {}", typed_source->to_string()) }; }
+        { throw std::runtime_error{ fmt::format("invalid call with 6 args to: {}", typed_source->to_string()) }; }
       },
       source
     );
@@ -289,7 +304,7 @@ namespace jank::runtime
           }
         }
         else
-        { throw std::runtime_error{ fmt::format("not callable: {}", typed_source->to_string()) }; }
+        { throw std::runtime_error{ fmt::format("invalid call with 7 args to: {}", typed_source->to_string()) }; }
       },
       source
     );
@@ -333,7 +348,7 @@ namespace jank::runtime
           }
         }
         else
-        { throw std::runtime_error{ fmt::format("not callable: {}", typed_source->to_string()) }; }
+        { throw std::runtime_error{ fmt::format("invalid call with 8 args to: {}", typed_source->to_string()) }; }
       },
       source
     );
@@ -379,7 +394,7 @@ namespace jank::runtime
           }
         }
         else
-        { throw std::runtime_error{ fmt::format("not callable: {}", typed_source->to_string()) }; }
+        { throw std::runtime_error{ fmt::format("invalid call with 9 args to: {}", typed_source->to_string()) }; }
       },
       source
     );
@@ -427,7 +442,7 @@ namespace jank::runtime
           }
         }
         else
-        { throw std::runtime_error{ fmt::format("not callable: {}", typed_source->to_string()) }; }
+        { throw std::runtime_error{ fmt::format("invalid call with 10 args to: {}", typed_source->to_string()) }; }
       },
       source
     );
@@ -532,7 +547,17 @@ namespace jank::runtime
           }
         }
         else
-        { throw std::runtime_error{ fmt::format("not callable: {}", typed_source->to_string()) }; }
+        {
+          throw std::runtime_error
+          {
+            fmt::format
+            (
+              "invalid call with {} args to: {}",
+              10 + runtime::detail::sequence_length(rest),
+              typed_source->to_string()
+            )
+          };
+        }
       },
       source
     );

diff --git a/src/cpp/jank/runtime/obj/keyword.cpp b/src/cpp/jank/runtime/obj/keyword.cpp
@@ -46,6 +46,12 @@ namespace jank::runtime
   native_string const& obj::keyword::get_namespace() const
   { return sym.ns; }
 
+  object_ptr obj::keyword::call(object_ptr const m) const
+  { return runtime::get(m, this); }
+
+  object_ptr obj::keyword::call(object_ptr const m, object_ptr const fallback) const
+  { return runtime::get(m, this, fallback); }
+
   bool obj::keyword::operator ==(obj::keyword const &rhs) const
   { return sym == rhs.sym; }
 }
diff --git a/src/cpp/jank/runtime/obj/persistent_array_map.cpp b/src/cpp/jank/runtime/obj/persistent_array_map.cpp
@@ -67,4 +67,20 @@ namespace jank::runtime
     copy.insert_or_assign(vec->data[0], vec->data[1]);
     return make_box<obj::persistent_array_map>(std::move(copy));
   }
+
+  object_ptr obj::persistent_array_map::call(object_ptr const o) const
+  {
+    auto const found(data.find(o));
+    if(!found)
+    { return obj::nil::nil_const(); }
+    return found;
+  }
+
+  object_ptr obj::persistent_array_map::call(object_ptr const o, object_ptr const fallback) const
+  {
+    auto const found(data.find(o));
+    if(!found)
+    { return fallback; }
+    return found;
+  }
 }
diff --git a/src/cpp/jank/runtime/obj/persistent_hash_map.cpp b/src/cpp/jank/runtime/obj/persistent_hash_map.cpp
@@ -109,4 +109,20 @@ namespace jank::runtime
     auto copy(data.set(vec->data[0], vec->data[1]));
     return make_box<obj::persistent_hash_map>(std::move(copy));
   }
+
+  object_ptr obj::persistent_hash_map::call(object_ptr const o) const
+  {
+    auto const found(data.find(o));
+    if(!found)
+    { return obj::nil::nil_const(); }
+    return *found;
+  }
+
+  object_ptr obj::persistent_hash_map::call(object_ptr const o, object_ptr const fallback) const
+  {
+    auto const found(data.find(o));
+    if(!found)
+    { return fallback; }
+    return *found;
+  }
 }
diff --git a/src/cpp/jank/runtime/obj/set.cpp b/src/cpp/jank/runtime/obj/set.cpp
@@ -65,6 +65,14 @@ namespace jank::runtime
     return ret;
   }
 
+  object_ptr obj::set::call(object_ptr const o) const
+  {
+    auto const found(data.find(o));
+    if(!found)
+    { return obj::nil::nil_const(); }
+    return *found;
+  }
+
   native_bool obj::set::contains(object_ptr const o) const
   { return data.find(o); }
 }
diff --git a/src/jank/clojure/core.jank b/src/jank/clojure/core.jank
@@ -1438,7 +1438,7 @@
                         (concat acc [flag true]))
                       []
                       flags)
-        args (filter (complement keyword?) args)]
+        args (remove keyword? args)]
     ; TODO: Set syntax.
     (let [supported (set [:as :reload :reload-all :require :use :verbose :refer :as-alias])
           unsupported (seq (remove supported flags))]