chiark
/
gitweb
/
~ian
/
userv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
meta fixes
[userv.git]
/
parser.c
diff --git
a/parser.c
b/parser.c
index 5700c3daef099a8b377b87cb3a33102e28e968a2..037e6f9fe19a49eef2b4a88fac87e80645acb964 100644
(file)
--- a/
parser.c
+++ b/
parser.c
@@
-6,7
+6,7
@@
* about m4 quoting &c., but we have to #include it so that the C
* objects from the lexer are available.
*
* about m4 quoting &c., but we have to #include it so that the C
* objects from the lexer are available.
*
- * Copyright (C)1996-1999 Ian Jackson
+ * Copyright (C)1996-1999
,2001
Ian Jackson
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by
@@
-148,7
+148,7
@@
static int dequote(char *inplace) {
int v;
p=q=inplace;
int v;
p=q=inplace;
- assert(*p
++ = '"')
;
+ assert(*p
=='"'); p++
;
while (*p && *p != '"') {
if (*p != '\\') { *q++= *p++; continue; }
switch (*++p) {
while (*p && *p != '"') {
if (*p != '\\') { *q++= *p++; continue; }
switch (*++p) {
@@
-183,7
+183,7
@@
static int dequote(char *inplace) {
}
}
}
}
}
}
- assert(*p);
assert(!*++
p);
+ assert(*p);
p++; assert(!*
p);
*q++= 0;
return tokv_quotedstring;
}
*q++= 0;
return tokv_quotedstring;
}
@@
-422,7
+422,7
@@
static int skip(int allowce) {
for (;;) { /* loop over lines */
cstate->reportlineno= cstate->lineno;
for (;;) { /* loop over lines */
cstate->reportlineno= cstate->lineno;
- do { token= yylex(); } while (token == tokv_lwsp);
+ do { token= yylex(); } while (token == tokv_lwsp
|| token == tokv_newline
);
if (token & tokt_exception) {
return token;
} else if (token & tokt_controlend) {
if (token & tokt_exception) {
return token;
} else if (token & tokt_controlend) {