Module Name: src
Committed By: christos
Date: Sat May 28 15:13:04 UTC 2011
Modified Files:
src/external/historical/nawk/dist: awkgram.y proto.h tran.c
Log Message:
Handle string concatenation in terms:
'{ print "foo" > "file" ".txt"; }',
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/historical/nawk/dist/awkgram.y
cvs rdiff -u -r1.3 -r1.4 src/external/historical/nawk/dist/proto.h
cvs rdiff -u -r1.4 -r1.5 src/external/historical/nawk/dist/tran.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/historical/nawk/dist/awkgram.y
diff -u src/external/historical/nawk/dist/awkgram.y:1.2 src/external/historical/nawk/dist/awkgram.y:1.3
--- src/external/historical/nawk/dist/awkgram.y:1.2 Thu Aug 26 10:55:19 2010
+++ src/external/historical/nawk/dist/awkgram.y Sat May 28 11:13:04 2011
@@ -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 ')'
Index: src/external/historical/nawk/dist/proto.h
diff -u src/external/historical/nawk/dist/proto.h:1.3 src/external/historical/nawk/dist/proto.h:1.4
--- src/external/historical/nawk/dist/proto.h:1.3 Sun Nov 7 17:55:26 2010
+++ src/external/historical/nawk/dist/proto.h Sat May 28 11:13:04 2011
@@ -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);
Index: src/external/historical/nawk/dist/tran.c
diff -u src/external/historical/nawk/dist/tran.c:1.4 src/external/historical/nawk/dist/tran.c:1.5
--- src/external/historical/nawk/dist/tran.c:1.4 Thu Jan 20 16:26:20 2011
+++ src/external/historical/nawk/dist/tran.c Sat May 28 11:13:04 2011
@@ -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;
