Mirrors/miller
1
0
Fork 0
mirror of https://github.com/johnkerl/miller.git synced 2026-07-24 16:38:57 +00:00
Code Issues Projects Releases Wiki Activity

sub with regex iterate

Browse source
This commit is contained in:
John Kerl 2015-10-09 15:55:38 -04:00
parent 66099da890
commit 0a502ea41f
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
c/mapping/mlr_val.c
View file

@ -192,7 +192,7 @@ mv_t sub_no_precomp_func(mv_t* pval1, mv_t* pval2, mv_t* pval3) {
int len3 = strlen(&pval1->u.strv[len1 + olen2]);
int len4 = len1 + nlen2 + len3;
char* string4 = mlr_malloc_or_die(len4);
char* string4 = mlr_malloc_or_die(len4 + 1);
strncpy(&string4[0], pval1->u.strv, len1);
strncpy(&string4[len1], pval3->u.strv, nlen2);
strncpy(&string4[len1+nlen2], &pval1->u.strv[len1+olen2], len3);
@ -230,20 +230,20 @@ mv_t sub_precomp_func(mv_t* pval1, regex_t* pregex, mv_t* pval3) {
if (!matched) {
return *pval1;
} else {
int so = pmatch[0].rm_so;
int eo = pmatch[0].rm_eo;
int len1 = so;
int len1 = so;
int olen2 = eo - so;
int nlen2 = strlen(pval3->u.strv);
int len3 = strlen(&pval1->u.strv[len1 + olen2]);
int len4 = len1 + nlen2 + len3;
char* string4 = mlr_malloc_or_die(len4);
char* string4 = mlr_malloc_or_die(len4 + 1);
strncpy(&string4[0], pval1->u.strv, len1);
strncpy(&string4[len1], pval3->u.strv, nlen2);
strncpy(&string4[len1+nlen2], &pval1->u.strv[len1+olen2], len3);
string4[len4] = 0;
free(pval1->u.strv);
free(pval3->u.strv);

2
c/reg_test/expected/out
View file

@ -1712,7 +1712,7 @@ SUB/GSUB
mlr --opprint put $y = sub($x, "e.*l", "y123y") ./reg_test/input/sub.dat
x y
hello hy123yoà
hello hy123yo
world world

2
c/todo.txt
View file

@ -1,7 +1,7 @@
================================================================
BUGFIXES
:D
$ mlr --opprint put '$y = sub($x, "e.*l", "y123y")' ./reg_test/input/sub.dat
================================================================
TOP OF LIST