diff options
| author | Bernhard Schommer <bschommer@users.noreply.github.com> | 2015-11-12 17:16:36 +0100 |
|---|---|---|
| committer | Bernhard Schommer <bschommer@users.noreply.github.com> | 2015-11-12 17:16:36 +0100 |
| commit | 9054efbd25eedd5627b9e6e62bf1204e5fa0ae94 (patch) | |
| tree | ade38b83786c932601753e5a7e09de04020670fe /cparser | |
| parent | 8c1b59808e9ee9888a846de2e3ff111628863f28 (diff) | |
| parent | 05a27df3423dfddd9e48abfba019cf26da5ce4a5 (diff) | |
| download | compcert-9054efbd25eedd5627b9e6e62bf1204e5fa0ae94.tar.gz compcert-9054efbd25eedd5627b9e6e62bf1204e5fa0ae94.zip | |
Merge pull request #68 from fpottier/cut
Fix in cparser/GNUmakefile.
Diffstat (limited to 'cparser')
| -rw-r--r-- | cparser/GNUmakefile | 2 | ||||
| -rw-r--r-- | cparser/Lexer.mll | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cparser/GNUmakefile b/cparser/GNUmakefile index d83c49e5..a2646c7b 100644 --- a/cparser/GNUmakefile +++ b/cparser/GNUmakefile @@ -68,7 +68,7 @@ DATABASE := handcrafted.messages # We use (GNU) cut when de-lexing examples sentences. -CUT := $(shell if which gcut >&/dev/null ; then echo gcut ; else echo cut ; fi) +CUT = $(shell if command -v gcut >/dev/null ; then echo gcut ; else echo cut ; fi) # ------------------------------------------------------------------------------ diff --git a/cparser/Lexer.mll b/cparser/Lexer.mll index 23d8ab8d..17c4528c 100644 --- a/cparser/Lexer.mll +++ b/cparser/Lexer.mll @@ -470,7 +470,7 @@ and singleline_comment = parse let lexbuf = Lexing.from_string text in lexbuf.lex_curr_p <- {lexbuf.lex_curr_p with pos_fname = filename; pos_lnum = 1}; let module I = Pre_parser.MenhirInterpreter in - let checkpoint = Pre_parser.Incremental.translation_unit_file() + let checkpoint = Pre_parser.Incremental.translation_unit_file lexbuf.lex_curr_p and supplier = I.lexer_lexbuf_to_supplier lexer lexbuf and succeed () = () and fail checkpoint = |