Fix parsing of values (chaining of identifier, function call, method call)

Author: ochafik

include/minja/minja.hpp

@@ -2205,7 +2205,7 @@ class Parser {
 
       auto value = parseValue();
 
-      while (it != end && consumeSpaces() && peekSymbols({ "[", "." })) {
+      while (it != end && consumeSpaces() && peekSymbols({ "[", ".", "(" })) {
         if (!consumeToken("[").empty()) {
           std::shared_ptr<Expression> index;
           auto slice_loc = get_location();
@@ -2250,15 +2250,13 @@ class Parser {
               auto key = std::make_shared<LiteralExpr>(identifier->location, Value(identifier->get_name()));
               value = std::make_shared<SubscriptExpr>(identifier->location, std::move(value), std::move(key));
             }
+        } else if (peekSymbols({ "(" })) {
+          auto callParams = parseCallArgs();
+          value = std::make_shared<CallExpr>(get_location(), std::move(value), std::move(callParams));
         }
         consumeSpaces();
       }
 
-      if (peekSymbols({ "(" })) {
-        auto location = get_location();
-        auto callParams = parseCallArgs();
-        value = std::make_shared<CallExpr>(location, std::move(value), std::move(callParams));
-      }
       return value;
     }
 

tests/CMakeLists.txt

@@ -324,6 +324,7 @@ set(MODEL_IDS
     Qwen/Qwen3-235B-A22B-Thinking-2507
     Qwen/Qwen3-Coder-30B-A3B-Instruct
     Qwen/QwQ-32B
+    zai-org/GLM-4.6
 
     # Broken, TODO:
     # ai21labs/AI21-Jamba-1.5-Large        # https://github.com/google/minja/issues/8

tests/test-syntax.cpp

@@ -11,7 +11,6 @@
 #include <gmock/gmock-matchers.h>
 
 #include <fstream>
-#include <iostream>
 #include <string>
 
 static std::string render_python(const std::string & template_str, const json & bindings, const minja::Options & options) {
@@ -373,6 +372,7 @@ TEST(SyntaxTest, SimpleCases) {
                 {}, {}
             )
         );
+        EXPECT_EQ("False", render("{{ trim(' a ').endswith(' ') }}", {} , {})); // Test parsing of expression (chaining of identifier, function call, method call)
     }
     EXPECT_EQ(
         "[0, 1, 2][0, 2]",