Merge branch 'bug/81'

* bug/81:
  minor, reactivate dgrepping for %c (count within month)
  test, add regression case for bug #81
  chore, make dexpr(1) compile as standalone util again

Author: hroptatyr

lib/date-core.c

@@ -251,8 +251,8 @@ dt_get_md(struct dt_d_s that)
 	}
 }
 
-/* too exotic to be public */
-static int
+/* too exotic to be public, nope bug #81 needs it */
+int
 dt_get_wcnt_mon(struct dt_d_s that)
 {
 	if (LIKELY(that.typ == DT_YMCW)) {

lib/date-core.h

@@ -462,6 +462,10 @@ extern unsigned int dt_get_yday(struct dt_d_s d);
  * Return N where N is the week within the year that THIS is in. */
 extern int dt_get_wcnt_year(struct dt_d_s this, unsigned int wkcnt_convention);
 
+/**
+ * Return N where N is the week within the month that THIS is in. */
+extern int dt_get_wcnt_mon(struct dt_d_s this);
+
 /* converters */
 extern dt_daisy_t dt_conv_to_daisy(struct dt_d_s);
 

src/dexpr-parser.y

@@ -43,8 +43,12 @@
 #include <stdio.h>
 #include <errno.h>
 #include "token.h"
+#include "date-core.h"
 #include "date-core-strpf.h"
+#include "dt-locale.h"
 #include "dexpr.h"
+#include "dexpr-parser.h"
+#include "dt-io.h"
 
 extern int yylex(YYSTYPE *yylval_param);
 extern int yyerror(dexpr_t *cur __attribute__((unused)), const char *errmsg);

src/dexpr.c

@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <stdbool.h>
 #include "strops.h"
+#include "dt-locale.h"
 #include "dexpr.h"
 #include "dexpr-parser.h"
 
@@ -559,7 +560,7 @@ dexkv_matches_p(const_dexkv_t dkv, struct dt_dt_s d)
 		break;
 	case DT_SPFL_N_WCNT_MON:
 		/* exotic function, needs extern'ing */
-		cmp = /*dt_get_count(d)*/0;
+		cmp = dt_get_wcnt_mon(d.d);
 		break;
 	case DT_SPFL_N_DCNT_YEAR:
 		cmp = dt_get_yday(d.d);
@@ -639,6 +640,8 @@ dexpr_matches_p(const_dexpr_t dex, struct dt_dt_s d)
 
 
 #if defined STANDALONE
+const char *prog = "dexpr";
+
 int
 main(int argc, char *argv[])
 {

test/Makefile.am

@@ -464,6 +464,8 @@ dt_tests += dgrep.038.clit
 dt_tests += dgrep.039.clit
 dt_tests += dgrep.040.clit
 dt_tests += dgrep.041.clit
+dt_tests += dgrep.042.clit
+dt_tests += dgrep.043.clit
 
 dt_tests += dround.001.clit
 dt_tests += dround.002.clit

test/dgrep.042.clit

@@ -0,0 +1,20 @@
+#!/usr/bin/clitoris  ## -*- shell-script -*-
+
+$ dseq 2018-03-05 2018-05-15 -f '%F %a %c %u' | dgrep '%c=04'
+2018-03-22 Thu 04 4
+2018-03-23 Fri 04 5
+2018-03-24 Sat 04 6
+2018-03-25 Sun 04 7
+2018-03-26 Mon 04 1
+2018-03-27 Tue 04 2
+2018-03-28 Wed 04 3
+2018-04-22 Sun 04 7
+2018-04-23 Mon 04 1
+2018-04-24 Tue 04 2
+2018-04-25 Wed 04 3
+2018-04-26 Thu 04 4
+2018-04-27 Fri 04 5
+2018-04-28 Sat 04 6
+$
+
+## dgrep.042.clit ends here

test/dgrep.043.clit

@@ -0,0 +1,16 @@
+#!/usr/bin/clitoris  ## -*- shell-script -*-
+
+$ dseq 2018-03-05 2018-05-15 -f '%F %a %c %u' | dgrep '%u=04'
+2018-03-08 Thu 02 4
+2018-03-15 Thu 03 4
+2018-03-22 Thu 04 4
+2018-03-29 Thu 05 4
+2018-04-05 Thu 01 4
+2018-04-12 Thu 02 4
+2018-04-19 Thu 03 4
+2018-04-26 Thu 04 4
+2018-05-03 Thu 01 4
+2018-05-10 Thu 02 4
+$
+
+## dgrep.043.clit ends here