On Tue, Aug 17, 2021 at 4:43 PM Nicolas Iooss <nicolas.iooss@xxxxxxx> wrote:
>
> On Tue, Aug 17, 2021 at 10:15 PM James Carter <jwcart2@xxxxxxxxx> wrote:
> >
> > On Tue, Aug 17, 2021 at 3:34 PM Nicolas Iooss <nicolas.iooss@xxxxxxx> wrote:
> > >
> > > On Mon, Aug 16, 2021 at 9:57 PM James Carter <jwcart2@xxxxxxxxx> wrote:
> > > >
> > > > Patches 1-5 cleanup minor issues with CIL's line marks.
> > > >
> > > > Patches 6-7 fix the way line mark works so that the correct line
> > > > numbers will be given for nested line marks.
> > > >
> > > > Patch 8 writes out line mark information when writing out the AST.
> > >
> > > Hello,
> > > Patch 8 is missing from the v2 (the series only contains 7 patches).
> > > Should the previous patch 8 ("libsepol/cil: When writing AST use line
> > > marks for src_info nodes") be also considered for review?
> > >
> >
> > Yes, I got caught up in correcting patch 7 that I never applied patch
> > 8 when updating. There are no changes to that patch.
> > Thanks,
> > Jim
>
> OK. For all 8 patches:
>
> Acked-by: Nicolas Iooss <nicolas.iooss@xxxxxxx>
>
Merged.
Thanks,
Jim
> Thanks,
> Nicolas
>
> > > > Changes in v2
> > > > In patch 6, use cil_strpool_add("1") instead of "1"
> > > > In patch 7, fix confusing usage of pre_hll_expand and pre_hll_offset; initialize pre_hll_offset, change format specifiers in cil_tree.c to use %u instead of %d.
> > > >
> > > > James Carter (7):
> > > > libsepol/cil: Check syntax of src_info statement
> > > > libsepol/cil: Check the token type after getting the next token
> > > > libsepol/cil: Check for valid line mark type immediately
> > > > libsepol/cil: Push line mark state first when processing a line mark
> > > > libsepol/cil: Create common string-to-unsigned-integer functions
> > > > libsepol/cil: Add line mark kind and line number to src info
> > > > libsepol/cil: Report correct high-level language line numbers
> > > >
> > > > libsepol/cil/src/cil.c | 70 ++++++++++++++++-
> > > > libsepol/cil/src/cil_binary.c | 9 ++-
> > > > libsepol/cil/src/cil_build_ast.c | 77 ++++++++++--------
> > > > libsepol/cil/src/cil_copy_ast.c | 5 +-
> > > > libsepol/cil/src/cil_internal.h | 9 ++-
> > > > libsepol/cil/src/cil_parser.c | 129 +++++++++++++++----------------
> > > > libsepol/cil/src/cil_tree.c | 57 +++++++++-----
> > > > libsepol/cil/src/cil_tree.h | 4 +-
> > > > 8 files changed, 226 insertions(+), 134 deletions(-)
> > > >
> > > > --
> > > > 2.31.1
> > > >
> > >
>
