xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

rc: implement 9atoms ` split {command} syntax extension

Browse source
This commit is contained in:
cinap_lenrek 2016-06-30 19:09:27 +02:00
parent cabbe0a84c
commit 3ec84c5d73
6 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sys/man/1/rc
View file

@ -233,6 +233,8 @@ The value is a single string containing the components of the named variable
separated by spaces. A variable with zero elements yields the empty string. separated by spaces. A variable with zero elements yields the empty string.
.HP .HP
.BI `{ command } .BI `{ command }
.HP
.BI ` "split " { command }
.br .br
.I rc .I rc
executes the executes the
@ -245,6 +247,8 @@ If
.B $ifs .B $ifs
is not otherwise set, its value is is not otherwise set, its value is
.BR "'\ \et\en'" . .BR "'\ \et\en'" .
In the second form of the command, split is used instead of
.BR $ifs .
.HP .HP
.BI <{ command } .BI <{ command }
.HP .HP

12
sys/src/cmd/rc/code.c
View file

@ -125,9 +125,19 @@ outcode(tree *t, int eflag)
emitf(Xconc); emitf(Xconc);
break; break;
case '`': case '`':
emitf(Xmark);
if(c0){
outcode(c0, 0);
emitf(Xglob);
} else {
emitf(Xmark);
emitf(Xword);
emits(estrdup("ifs"));
emitf(Xdol);
}
emitf(Xbackq); emitf(Xbackq);
p = emiti(0); p = emiti(0);
outcode(c0, 0); outcode(c1, 0);
emitf(Xexit); emitf(Xexit);
stuffdot(p); stuffdot(p);
break; break;

2
sys/src/cmd/rc/exec.c
View file

@ -208,7 +208,7 @@ main(int argc, char *argv[])
* Xappend(file)[fd] open file to append * Xappend(file)[fd] open file to append
* Xassign(name, val) assign val to name * Xassign(name, val) assign val to name
* Xasync{... Xexit} make thread for {}, no wait * Xasync{... Xexit} make thread for {}, no wait
* Xbackq{... Xreturn} make thread for {}, push stdout * Xbackq(split){... Xreturn} make thread for {}, push stdout
* Xbang complement condition * Xbang complement condition
* Xcase(pat, value){...} exec code on match, leave (value) on * Xcase(pat, value){...} exec code on match, leave (value) on
* stack * stack

6
sys/src/cmd/rc/havefork.c
View file

@ -85,10 +85,11 @@ Xbackq(void)
int pfd[2]; int pfd[2];
char *s, *wd, *ewd, *stop; char *s, *wd, *ewd, *stop;
struct io *f; struct io *f;
var *ifs = vlook("ifs");
word *v, *nextv; word *v, *nextv;
stop = ifs->val? ifs->val->word: ""; stop = "";
if(runq->argv && runq->argv->words)
stop = runq->argv->words->word;
if(pipe(pfd)<0){ if(pipe(pfd)<0){
Xerror("can't make pipe"); Xerror("can't make pipe");
return; return;
@ -135,6 +136,7 @@ Xbackq(void)
free(wd); free(wd);
closeio(f); closeio(f);
Waitfor(pid, 0); Waitfor(pid, 0);
poplist(); /* ditch split in "stop" */
/* v points to reversed arglist -- reverse it onto argv */ /* v points to reversed arglist -- reverse it onto argv */
while(v){ while(v){
nextv = v->next; nextv = v->next;

2
sys/src/cmd/rc/pcmd.c
View file

@ -32,7 +32,7 @@ pcmd(io *f, tree *t)
break; break;
case '^': pfmt(f, "%t^%t", c0, c1); case '^': pfmt(f, "%t^%t", c0, c1);
break; break;
case '`': pfmt(f, "`%t", c0); case '`': pfmt(f, "`%t%t", c0, c1);
break; break;
case ANDAND: pfmt(f, "%t && %t", c0, c1); case ANDAND: pfmt(f, "%t && %t", c0, c1);
break; break;

3
sys/src/cmd/rc/syn.y
View file

@ -83,7 +83,8 @@ comword: '$' word {$$=tree1('$', $2);}
| '"' word {$$=tree1('"', $2);} | '"' word {$$=tree1('"', $2);}
| COUNT word {$$=tree1(COUNT, $2);} | COUNT word {$$=tree1(COUNT, $2);}
| WORD | WORD
| '`' brace {$$=tree1('`', $2);} | '`' brace {$$=tree2('`', (struct tree*)0, $2);}
| '`' word brace {$$=tree2('`', $2, $3);}
| '(' words ')' {$$=tree1(PAREN, $2);} | '(' words ')' {$$=tree1(PAREN, $2);}
| REDIR brace {$$=mung1($1, $2); $$->type=PIPEFD;} | REDIR brace {$$=mung1($1, $2); $$->type=PIPEFD;}
keyword: FOR|IN|WHILE|IF|NOT|TWIDDLE|BANG|SUBSHELL|SWITCH|FN keyword: FOR|IN|WHILE|IF|NOT|TWIDDLE|BANG|SUBSHELL|SWITCH|FN