[0/8] libsepol/cil: Line mark cleanup and fix

Message

James Carter Aug. 10, 2021, 6:05 p.m. UTC

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.

James Carter (8):
  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: When writing AST use line marks for src_info nodes

 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    | 131 +++++++++++++++----------------
 libsepol/cil/src/cil_tree.c      |  53 +++++++++----
 libsepol/cil/src/cil_tree.h      |   4 +-
 libsepol/cil/src/cil_write_ast.c |  21 ++++-
 9 files changed, 245 insertions(+), 134 deletions(-)