Merge branch 'master' of ssh://git.code.sf.net/p/gretl/git

Author: AllinCottrell

lib/src/geneval.c

@@ -16651,10 +16651,9 @@ static NODE *query_eval_scalar (double x, NODE *n, parser *p)
     return ret;
 }
 
-/* The following allows for @n to hold a scalar, real matrix
-   or complex matrix, and also allows for the case where
-   @n's payload is real-valued but a complex result is required,
-   signalled by @need_z.
+/* The following allows for @n to hold a scalar, real matrix or
+   complex matrix, and also allows for the case where @n's payload is
+   real-valued but a complex result is required, signalled by @need_z.
 */
 
 static int query_term_get_value (NODE *n, int i, int j,
@@ -16825,12 +16824,11 @@ static NODE *eval_query (NODE *t, NODE *c, parser *p)
     } else if (c->t == SERIES) {
         ret = query_eval_series(c->v.xvec, t, p);
     } else if (c->t == MAT) {
-        if (0 /* gretl_matrix_is_scalar(c->v.m) */) {
-            /* Watch out! This breaks compilation. */
-            ret = query_eval_scalar(c->v.m->val[0], t, p);
-        } else {
-            ret = query_eval_matrix(c->v.m, t, p);
-        }
+        /* note: at one point we had here special handling for
+           the case where the @c matrix is 1 x 1, but this
+           resulted in breakage elsewhere
+        */
+        ret = query_eval_matrix(c->v.m, t, p);
     } else {
         /* invalid type for boolean condition */
         p->err = e_types(c);