Merge pull request #4 from Ultimaker/NP-1167

Richer support for python syntax

Author: HellAholic

CMakeLists.txt

@@ -1,11 +1,18 @@
 cmake_minimum_required(VERSION 3.26)
 project(cura-formulae-engine)
 
+include(CTest)
+
 find_package(standardprojectsettings REQUIRED)
 option(ENABLE_TESTS "Build with unit test" ON)
 option(EXTENSIVE_WARNINGS "Build with all warnings" ON)
 option(ENABLE_APPS "Build apps example" ON)
 
+if (ENABLE_TESTS AND NOT BUILD_TESTING)
+    message(STATUS "ENABLE_TESTS is ON, forcing BUILD_TESTING=ON so CTest can discover tests")
+    set(BUILD_TESTING ON CACHE BOOL "Enable CTest" FORCE)
+endif ()
+
 find_package(spdlog REQUIRED)
 find_package(lexy REQUIRED)
 find_package(zeus_expected REQUIRED)
@@ -59,6 +66,7 @@ set(CURA_FORMULAE_ENGINE__SRC
     src/ast/slice_expr.cpp
     src/ast/tuple_expr.cpp
     src/ast/variable_expr.cpp
+    src/ast/property_access_expr.cpp
     src/parser/parser.cpp
     src/ast/binary_expr/binary_expr.cpp
     src/ast/binary_expr/add_expr.cpp

conandata.yml

@@ -1 +1 @@
-version: "1.1.0"
+version: "1.2.0"

include/cura-formulae-engine/ast/binary_expr/binary_expr.h

@@ -12,7 +12,7 @@ struct BinaryExpr : Expr
     ExprPtr lhs;
     ExprPtr rhs;
 
-    BinaryExpr(ExprPtr lhs, ExprPtr rhs)
+    BinaryExpr(ExprPtr&& lhs, ExprPtr&& rhs)
         : lhs(std::move(lhs))
         , rhs(std::move(rhs))
     {

include/cura-formulae-engine/ast/condition_expr.h

@@ -12,7 +12,7 @@ struct ConditionExpr final : Expr
     ExprPtr condition;
     ExprPtr else_expr;
 
-    ConditionExpr(ExprPtr then_expr, ExprPtr condition, ExprPtr else_expr)
+    ConditionExpr(ExprPtr&& then_expr, ExprPtr&& condition, ExprPtr&& else_expr)
         : then_expr(std::move(then_expr))
         , condition(std::move(condition))
         , else_expr(std::move(else_expr))

include/cura-formulae-engine/ast/expr_ptr.h

@@ -16,7 +16,7 @@ struct ExprPtr final : Expr
 
     std::unique_ptr<Expr> ptr;
 
-    ExprPtr(std::unique_ptr<Expr> ptr)
+    ExprPtr(std::unique_ptr<Expr>&& ptr)
         : ptr(std::move(ptr))
     {
     }

include/cura-formulae-engine/ast/fn_application_expr.h

@@ -8,12 +8,25 @@ namespace CuraFormulaeEngine::ast
 
 struct FnApplicationExpr final : Expr
 {
+    struct KeywordArg
+    {
+        std::string name;
+        ExprPtr value;
+
+        [[nodiscard]] bool deepEq(const KeywordArg& other) const noexcept
+        {
+            return name == other.name && value.deepEq(other.value);
+        }
+    };
+
     ExprPtr fn;
     std::vector<ExprPtr> args;
+    std::vector<KeywordArg> kwargs;
 
-    FnApplicationExpr(ExprPtr fn, std::vector<ExprPtr> args)
+    FnApplicationExpr(ExprPtr&& fn, std::vector<ExprPtr>&& args, std::vector<KeywordArg>&& kwargs = {})
         : fn(std::move(fn))
         , args(std::move(args))
+        , kwargs(std::move(kwargs))
     {
     }
 

include/cura-formulae-engine/ast/index_expr.h

@@ -19,7 +19,7 @@ struct IndexExpr final : Expr
     ExprPtr array;
     ExprPtr index;
 
-    IndexExpr(ExprPtr array, ExprPtr index)
+    IndexExpr(ExprPtr&& array, ExprPtr&& index)
         : array(std::move(array))
         , index(std::move(index))
     {

include/cura-formulae-engine/ast/list_comprehension_expr.h

@@ -21,7 +21,7 @@ struct ListComprehensionExpr final : Expr
         ExprPtr iterable;
         std::vector<ExprPtr> conditions;
 
-        loop(ExprPtr iterator_key, ExprPtr iterable, std::vector<ExprPtr> conditions)
+        loop(ExprPtr&& iterator_key, ExprPtr&& iterable, std::vector<ExprPtr>&& conditions)
             : iterator_key(std::move(iterator_key))
             , iterable(std::move(iterable))
             , conditions(std::move(conditions))
@@ -32,7 +32,7 @@ struct ListComprehensionExpr final : Expr
     ExprPtr iterator;
     std::vector<loop> loops;
 
-    ListComprehensionExpr(ExprPtr iterator, std::vector<loop> loops)
+    ListComprehensionExpr(ExprPtr&& iterator, std::vector<loop>&& loops)
         : iterator(std::move(iterator))
         , loops(std::move(loops))
     {

include/cura-formulae-engine/ast/list_expr.h

@@ -13,7 +13,7 @@ struct ListExpr final : Expr
 {
     std::vector<ExprPtr> elements;
 
-    ListExpr(std::vector<ExprPtr> elements)
+    ListExpr(std::vector<ExprPtr>&& elements)
         : elements(std::move(elements))
     {
     }

include/cura-formulae-engine/ast/property_access_expr.h

@@ -0,0 +1,33 @@
+#pragma once
+
+#include "cura-formulae-engine/ast/ast.h"
+#include "expr_ptr.h"
+
+#include <string>
+
+namespace CuraFormulaeEngine::ast
+{
+
+struct PropertyAccessExpr final : Expr
+{
+    ExprPtr object;
+    std::string property;
+
+    PropertyAccessExpr(ExprPtr&& object, std::string&& property)
+        : object(std::move(object))
+        , property(std::move(property))
+    {
+    }
+
+    [[nodiscard]] std::string toString() const noexcept final;
+
+    [[nodiscard]] eval::Result evaluate(const env::Environment* environment) const noexcept final;
+
+    [[nodiscard]] std::unordered_set<std::string> freeVariables() const noexcept final;
+
+    [[nodiscard]] bool deepEq(const Expr& other) const noexcept final;
+
+    void visitAll(std::function<void(const Expr&)> visitor) const noexcept final;
+};
+
+} // namespace CuraFormulaeEngine::ast