geometry compiler: count(list): bug #48

curv3d · Dec 24, 2018 · 01a541d · 01a541d
1 parent fff5fab
commit 01a541d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/libcurv/builtin.cc b/libcurv/builtin.cc
@@ -446,6 +446,15 @@ struct Count_Function : public Legacy_Function
         }
         throw Exception(At_Arg(*this, args), "not a list or string");
     }
+    GL_Value gl_call(GL_Frame& f) const override
+    {
+        auto arg = f[0];
+        if (!arg.type.is_list())
+            throw Exception(At_GL_Arg(0, f), "count: argument is not a list");
+        auto result = f.gl.newvalue(GL_Type::Num());
+        f.gl.out << "  float "<<result<<" = "<<arg.type.count()<<";\n";
+        return result;
+    }
 };
 struct Fields_Function : public Legacy_Function
 {

diff --git a/libcurv/gl_type.h b/libcurv/gl_type.h
@@ -88,10 +88,9 @@ struct GL_Type
     // first dimension, if type is a list
     inline unsigned count() const
     {
-        if (base_type_ >= Base_Type::Vec2)
-            return base_info().dim1;
-        else
+        if (rank_)
             return dim1_;
+        return base_info().dim1;
     }
     // If this is an array, strip one dimension off of the type.
     GL_Type abase()