Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/historical/nawk/dist Handle string concatenation in...
details: https://anonhg.NetBSD.org/src/rev/220f3cfc2c23
branches: trunk
changeset: 765492:220f3cfc2c23
user: christos <christos%NetBSD.org@localhost>
date: Sat May 28 15:13:04 2011 +0000
description:
Handle string concatenation in terms:
'{ print "foo" > "file" ".txt"; }',
diffstat:
external/historical/nawk/dist/awkgram.y | 8 +++++++-
external/historical/nawk/dist/proto.h | 1 +
external/historical/nawk/dist/tran.c | 16 ++++++++++++++++
3 files changed, 24 insertions(+), 1 deletions(-)
diffs (69 lines):
diff -r 6fc66d3470cb -r 220f3cfc2c23 external/historical/nawk/dist/awkgram.y
--- a/external/historical/nawk/dist/awkgram.y Sat May 28 14:40:13 2011 +0000
+++ b/external/historical/nawk/dist/awkgram.y Sat May 28 15:13:04 2011 +0000
@@ -75,6 +75,7 @@
%type <i> do st
%type <i> pst opt_pst lbrace rbrace rparen comma nl opt_nl and bor
%type <i> subop print
+%type <cp> string
%right ASGNOP
%right '?'
@@ -352,6 +353,11 @@
SUB | GSUB
;
+string:
+ STRING
+ | string STRING { $$ = catstr($1, $2); }
+ ;
+
term:
term '/' ASGNOP term { $$ = op2(DIVEQ, $1, $4); }
| term '+' term { $$ = op2(ADD, $1, $3); }
@@ -414,7 +420,7 @@
| SPLIT '(' pattern comma varname ')'
{ $$ = op4(SPLIT, $3, makearr($5), NIL, (Node*)STRING); } /* default */
| SPRINTF '(' patlist ')' { $$ = op1($1, $3); }
- | STRING { $$ = celltonode($1, CCON); }
+ | string { $$ = celltonode($1, CCON); }
| subop '(' reg_expr comma pattern ')'
{ $$ = op4($1, NIL, (Node*)makedfa($3, 1), $5, rectonode()); }
| subop '(' pattern comma pattern ')'
diff -r 6fc66d3470cb -r 220f3cfc2c23 external/historical/nawk/dist/proto.h
--- a/external/historical/nawk/dist/proto.h Sat May 28 14:40:13 2011 +0000
+++ b/external/historical/nawk/dist/proto.h Sat May 28 15:13:04 2011 +0000
@@ -114,6 +114,7 @@
extern char *tostring(const char *);
extern char *tostringN(const char *, size_t n);
extern char *qstring(const char *, int);
+extern Cell *catstr(Cell *, Cell *);
extern void recinit(unsigned int);
extern void initgetrec(void);
diff -r 6fc66d3470cb -r 220f3cfc2c23 external/historical/nawk/dist/tran.c
--- a/external/historical/nawk/dist/tran.c Sat May 28 14:40:13 2011 +0000
+++ b/external/historical/nawk/dist/tran.c Sat May 28 15:13:04 2011 +0000
@@ -428,6 +428,22 @@
return(p);
}
+Cell *catstr(Cell *a, Cell *b) /* concatenate a and b */
+{
+ Cell *c;
+ char *p;
+ char *sa = getsval(a);
+ char *sb = getsval(b);
+ size_t l = strlen(sa) + strlen(sb) + 1;
+ p = malloc(l);
+ if (p == NULL)
+ FATAL("out of space concatenating %s and %s", sa, sb);
+ snprintf(p, l, "%s%s", sa, sb);
+ c = setsymtab(p, p, 0.0, CON|STR|DONTFREE, symtab);
+ free(p);
+ return c;
+}
+
char *tostringN(const char *s, size_t n) /* make a copy of string s */
{
char *p;
Home |
Main Index |
Thread Index |
Old Index