Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
5ef563a7
Commit
5ef563a7
authored
May 28, 2021
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Convert CNUM and FNUM to double as part of lexing
parent
d4cf677a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
28 deletions
+14
-28
vcc_compile.h
lib/libvcc/vcc_compile.h
+1
-0
vcc_expr.c
lib/libvcc/vcc_expr.c
+4
-4
vcc_token.c
lib/libvcc/vcc_token.c
+5
-0
vcc_utils.c
lib/libvcc/vcc_utils.c
+4
-24
No files found.
lib/libvcc/vcc_compile.h
View file @
5ef563a7
...
...
@@ -101,6 +101,7 @@ struct token {
VTAILQ_ENTRY
(
token
)
src_list
;
unsigned
cnt
;
char
*
dec
;
double
num
;
};
/*---------------------------------------------------------------------*/
...
...
lib/libvcc/vcc_expr.c
View file @
5ef563a7
...
...
@@ -691,13 +691,13 @@ vcc_number(struct vcc *tl, struct expr **e, vcc_type_t fmt, const char *sign)
t
=
tl
->
t
;
vcc_NextToken
(
tl
);
if
(
tl
->
t
->
tok
==
ID
)
{
e1
=
vcc_mk_expr
(
DURATION
,
"
(%s%.*s)
* %g"
,
sign
,
PF
(
t
)
,
vcc_DurationUnit
(
tl
));
e1
=
vcc_mk_expr
(
DURATION
,
"
%s%.3f
* %g"
,
sign
,
t
->
num
,
vcc_DurationUnit
(
tl
));
ERRCHK
(
tl
);
}
else
if
(
fmt
==
REAL
||
t
->
tok
==
FNUM
)
{
e1
=
vcc_mk_expr
(
REAL
,
"%s%.
*s"
,
sign
,
PF
(
t
)
);
e1
=
vcc_mk_expr
(
REAL
,
"%s%.
3f"
,
sign
,
t
->
num
);
}
else
{
e1
=
vcc_mk_expr
(
INT
,
"%s%.
*s"
,
sign
,
PF
(
t
)
);
e1
=
vcc_mk_expr
(
INT
,
"%s%.
0f"
,
sign
,
t
->
num
);
}
}
e1
->
constant
=
EXPR_CONST
;
...
...
lib/libvcc/vcc_token.c
View file @
5ef563a7
...
...
@@ -446,6 +446,7 @@ static const char *
vcc_lex_number
(
struct
vcc
*
tl
,
struct
source
*
sp
,
const
char
*
p
)
{
const
char
*
q
,
*
r
;
char
*
s
;
for
(
q
=
p
;
q
<
sp
->
e
;
q
++
)
if
(
!
vct_isdigit
(
*
q
))
...
...
@@ -457,6 +458,8 @@ vcc_lex_number(struct vcc *tl, struct source *sp, const char *p)
vcc_ErrWhere
(
tl
,
tl
->
t
);
return
(
NULL
);
}
tl
->
t
->
num
=
strtod
(
p
,
&
s
);
assert
(
s
==
tl
->
t
->
e
);
return
(
q
);
}
r
=
++
q
;
...
...
@@ -469,6 +472,8 @@ vcc_lex_number(struct vcc *tl, struct source *sp, const char *p)
vcc_ErrWhere
(
tl
,
tl
->
t
);
return
(
NULL
);
}
tl
->
t
->
num
=
strtod
(
p
,
&
s
);
assert
(
s
==
tl
->
t
->
e
);
return
(
r
);
}
...
...
lib/libvcc/vcc_utils.c
View file @
5ef563a7
...
...
@@ -284,20 +284,13 @@ vcc_DurationUnit(struct vcc *tl)
uint64_t
vcc_UintVal
(
struct
vcc
*
tl
)
{
const
char
*
p
,
*
errtxt
;
int64_t
retval
;
if
(
tl
->
t
->
tok
!=
CNUM
)
{
Expect
(
tl
,
CNUM
);
return
(
0
);
}
p
=
tl
->
t
->
b
;
retval
=
SF_Parse_Integer
(
&
p
,
&
errtxt
);
if
(
errno
)
{
VSB_printf
(
tl
->
sb
,
"Bad UINT: %s
\n
"
,
errtxt
);
vcc_ErrWhere
(
tl
,
tl
->
t
);
return
(
0
);
}
retval
=
(
int64_t
)
round
(
tl
->
t
->
num
);
if
(
retval
<
0
)
{
VSB_printf
(
tl
->
sb
,
"UINT cannot be negative
\n
"
);
vcc_ErrWhere
(
tl
,
tl
->
t
);
...
...
@@ -310,20 +303,13 @@ vcc_UintVal(struct vcc *tl)
static
double
vcc_DoubleVal
(
struct
vcc
*
tl
)
{
const
char
*
p
,
*
errtxt
;
double
retval
;
if
(
tl
->
t
->
tok
!=
CNUM
&&
tl
->
t
->
tok
!=
FNUM
)
{
Expect
(
tl
,
CNUM
);
return
(
0
);
}
p
=
tl
->
t
->
b
;
retval
=
SF_Parse_Decimal
(
&
p
,
&
errtxt
);
if
(
errno
)
{
VSB_printf
(
tl
->
sb
,
"Bad REAL: %s
\n
"
,
errtxt
);
vcc_ErrWhere
(
tl
,
tl
->
t
);
return
(
0
);
}
retval
=
tl
->
t
->
num
;
vcc_NextToken
(
tl
);
return
(
retval
);
}
...
...
@@ -349,19 +335,13 @@ vcc_ByteVal(struct vcc *tl, VCL_INT *d)
{
double
v
;
VCL_INT
retval
;
const
char
*
p
,
*
errtxt
;
const
char
*
errtxt
;
if
(
tl
->
t
->
tok
!=
CNUM
&&
tl
->
t
->
tok
!=
FNUM
)
{
Expect
(
tl
,
CNUM
);
return
;
}
p
=
tl
->
t
->
b
;
v
=
SF_Parse_Number
(
&
p
,
&
errtxt
);
if
(
errno
)
{
VSB_printf
(
tl
->
sb
,
"Bad BYTES: %s
\n
"
,
errtxt
);
vcc_ErrWhere
(
tl
,
tl
->
t
);
return
;
}
v
=
tl
->
t
->
num
;
vcc_NextToken
(
tl
);
if
(
tl
->
t
->
tok
!=
ID
)
{
VSB_cat
(
tl
->
sb
,
"Expected BYTES unit (B, KB, MB...) got "
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment