Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename parsing/parser_menhir into parsing/parser

master
Gabriel Scherer 2018-08-25 14:46:51 +02:00
parent 23f7c8191e
commit d09349f631
14 changed files with 3018 additions and 3025 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.depend
View File

@ -105,13 +105,13 @@ parsing/docstrings.cmo : utils/warnings.cmi parsing/parsetree.cmi \
parsing/docstrings.cmx : utils/warnings.cmx parsing/parsetree.cmi \
parsing/location.cmx parsing/docstrings.cmi
parsing/docstrings.cmi : parsing/parsetree.cmi parsing/location.cmi
parsing/lexer.cmo : utils/warnings.cmi parsing/parser_menhir.cmi \
parsing/lexer.cmo : utils/warnings.cmi parsing/parser.cmi \
utils/misc.cmi parsing/location.cmi parsing/docstrings.cmi \
parsing/lexer.cmi
parsing/lexer.cmx : utils/warnings.cmx parsing/parser_menhir.cmx \
parsing/lexer.cmx : utils/warnings.cmx parsing/parser.cmx \
utils/misc.cmx parsing/location.cmx parsing/docstrings.cmx \
parsing/lexer.cmi
parsing/lexer.cmi : parsing/parser_menhir.cmi parsing/location.cmi
parsing/lexer.cmi : parsing/parser.cmi parsing/location.cmi
parsing/location.cmo : utils/warnings.cmi utils/terminfo.cmi utils/misc.cmi \
utils/clflags.cmi utils/build_path_prefix_map.cmi parsing/location.cmi
parsing/location.cmx : utils/warnings.cmx utils/terminfo.cmx utils/misc.cmx \
@ -120,10 +120,10 @@ parsing/location.cmi : utils/warnings.cmi
parsing/longident.cmo : utils/misc.cmi parsing/longident.cmi
parsing/longident.cmx : utils/misc.cmx parsing/longident.cmi
parsing/longident.cmi :
parsing/parse.cmo : parsing/syntaxerr.cmi parsing/parser_menhir.cmi \
parsing/parse.cmo : parsing/syntaxerr.cmi parsing/parser.cmi \
parsing/location.cmi parsing/lexer.cmi parsing/docstrings.cmi \
parsing/parse.cmi
parsing/parse.cmx : parsing/syntaxerr.cmx parsing/parser_menhir.cmx \
parsing/parse.cmx : parsing/syntaxerr.cmx parsing/parser.cmx \
parsing/location.cmx parsing/lexer.cmx parsing/docstrings.cmx \
parsing/parse.cmi
parsing/parse.cmi : parsing/parsetree.cmi
@ -137,15 +137,15 @@ parsing/parser.cmx : parsing/syntaxerr.cmx parsing/parsetree.cmi \
parsing/parser.cmi
parsing/parser.cmi : parsing/parsetree.cmi parsing/location.cmi \
parsing/docstrings.cmi
parsing/parser_menhir.cmo : parsing/syntaxerr.cmi parsing/parsetree.cmi \
parsing/parser.cmo : parsing/syntaxerr.cmi parsing/parsetree.cmi \
parsing/longident.cmi parsing/location.cmi parsing/docstrings.cmi \
utils/clflags.cmi parsing/camlinternalMenhirLib.cmi parsing/asttypes.cmi \
parsing/ast_helper.cmi parsing/parser_menhir.cmi
parsing/parser_menhir.cmx : parsing/syntaxerr.cmx parsing/parsetree.cmi \
parsing/ast_helper.cmi parsing/parser.cmi
parsing/parser.cmx : parsing/syntaxerr.cmx parsing/parsetree.cmi \
parsing/longident.cmx parsing/location.cmx parsing/docstrings.cmx \
utils/clflags.cmx parsing/camlinternalMenhirLib.cmx parsing/asttypes.cmi \
parsing/ast_helper.cmx parsing/parser_menhir.cmi
parsing/parser_menhir.cmi : parsing/parsetree.cmi parsing/location.cmi \
parsing/ast_helper.cmx parsing/parser.cmi
parsing/parser.cmi : parsing/parsetree.cmi parsing/location.cmi \
parsing/docstrings.cmi parsing/camlinternalMenhirLib.cmi
parsing/parsetree.cmi : parsing/longident.cmi parsing/location.cmi \
parsing/asttypes.cmi
@ -2396,12 +2396,12 @@ driver/main_args.cmx : utils/warnings.cmx utils/profile.cmx utils/config.cmx \
utils/clflags.cmx driver/main_args.cmi
driver/main_args.cmi :
driver/makedepend.cmo : driver/pparse.cmi parsing/parsetree.cmi \
parsing/parser_menhir.cmi parsing/parse.cmi utils/misc.cmi \
parsing/parser.cmi parsing/parse.cmi utils/misc.cmi \
parsing/longident.cmi parsing/location.cmi parsing/lexer.cmi \
parsing/depend.cmi utils/config.cmi driver/compplugin.cmi \
driver/compenv.cmi utils/clflags.cmi driver/makedepend.cmi
driver/makedepend.cmx : driver/pparse.cmx parsing/parsetree.cmi \
parsing/parser_menhir.cmx parsing/parse.cmx utils/misc.cmx \
parsing/parser.cmx parsing/parse.cmx utils/misc.cmx \
parsing/longident.cmx parsing/location.cmx parsing/lexer.cmx \
parsing/depend.cmx utils/config.cmx driver/compplugin.cmx \
driver/compenv.cmx utils/clflags.cmx driver/makedepend.cmi

4
.gitattributes vendored
View File

@ -106,8 +106,8 @@ menhir-bench.bash ocaml-typo=missing-header,utf8
# bootstrap files produced by Menhir
/boot/menhir/menhirLib.ml ocaml-typo=long-line,missing-header,utf8,white-at-eol,unused-prop
/boot/menhir/menhirLib.mli ocaml-typo=long-line,missing-header,utf8,white-at-eol,unused-prop
/boot/menhir/parser_menhir.ml ocaml-typo=long-line,very-long-line,missing-header,white-at-eol,unused-prop
/boot/menhir/parser_menhir.mli ocaml-typo=long-line,very-long-line,missing-header,white-at-eol,unused-prop
/boot/menhir/parser.ml ocaml-typo=long-line,very-long-line,missing-header,white-at-eol,unused-prop
/boot/menhir/parser.mli ocaml-typo=long-line,very-long-line,missing-header,white-at-eol,unused-prop
# Line-ending specifications, for Windows interoperability
*.sh text eol=lf

3
.gitignore vendored
View File

@ -159,11 +159,8 @@ _ocamltestd
/parsing/parser.output
/parsing/parser.automaton
/parsing/parser.conflicts
/parsing/camlinternalMenhirLib.ml
/parsing/camlinternalMenhirLib.mli
/parsing/parser_menhir.ml
/parsing/parser_menhir.mli
/runtime/caml/jumptbl.h
/runtime/caml/m.h

12
Makefile
View File

@ -79,7 +79,7 @@ UTILS=utils/config.cmo utils/build_path_prefix_map.cmo utils/misc.cmo \
PARSING=parsing/location.cmo parsing/longident.cmo \
parsing/docstrings.cmo parsing/syntaxerr.cmo \
parsing/ast_helper.cmo \
parsing/camlinternalMenhirLib.cmo parsing/parser_menhir.cmo \
parsing/camlinternalMenhirLib.cmo parsing/parser.cmo \
parsing/lexer.cmo parsing/parse.cmo parsing/printast.cmo \
parsing/pprintast.cmo \
parsing/ast_mapper.cmo parsing/ast_iterator.cmo parsing/attr_helper.cmo \
@ -1057,20 +1057,20 @@ clean::
# are OCaml source files) and Menhir's runtime libraries
# (that the parser files rely on) in boot/
parsing/parser_menhir.ml: \
boot/menhir/parser_menhir.ml parsing/parser_menhir.mly
@if [ parsing/parser_menhir.mly -nt boot/menhir/parser_menhir.ml ]; \
parsing/parser.ml: \
boot/menhir/parser.ml parsing/parser.mly
@if [ parsing/parser.mly -nt boot/menhir/parser.ml ]; \
then \
echo; \
tput setaf 3; tput bold; printf "Warning: "; tput sgr0; \
echo "Your 'parser_menhir.mly' file is more recent \
echo "Your 'parser.mly' file is more recent \
than the parser in 'boot/'."; \
echo "Its changes will be ignored unless you run:"; \
echo " make promote-menhir"; \
echo; \
fi
cat $< | sed "s/MenhirLib/CamlinternalMenhirLib/g" > $@
parsing/parser_menhir.mli: boot/menhir/parser_menhir.mli
parsing/parser.mli: boot/menhir/parser.mli
cat $< | sed "s/MenhirLib/CamlinternalMenhirLib/g" > $@
# We rename the menhirLib module into CamlinternalMenhirlib,

16
Makefile.menhir
View File

@ -46,21 +46,21 @@ import-menhirLib:
# # parsing/parser.cmo makes --infer work: the .cmi
# # of all modules that parser{_menhir}.mly semantic
# # actions depend on have already been built.
promote-menhir: parsing/parser_menhir.mly
promote-menhir: parsing/parser.mly
$(MAKE) import-menhirLib
$(MENHIR) $(MENHIRFLAGS) parsing/parser_menhir.mly
cp $(addprefix parsing/parser_menhir.,ml mli) boot/menhir
$(MENHIR) $(MENHIRFLAGS) parsing/parser.mly
cp $(addprefix parsing/parser.,ml mli) boot/menhir
.PHONY: test-menhir
test-menhir: parsing/parser_menhir.mly
$(MENHIR) $(MENHIRFLAGS) parsing/parser_menhir.mly
test-menhir: parsing/parser.mly
$(MENHIR) $(MENHIRFLAGS) parsing/parser.mly
sed -i "s/MenhirLib/CamlinternalMenhirLib/g" \
$(addprefix parsing/parser_menhir.,ml mli)
$(MAKE) parsing/parser_menhir.cmo
$(addprefix parsing/parser.,ml mli)
$(MAKE) parsing/parser.cmo
partialclean-menhir::
rm -f \
$(addprefix parsing/parser_menhir.,ml mli) \
$(addprefix parsing/parser.,ml mli) \
$(addprefix parsing/camlinternalMenhirLib.,ml mli)
clean-menhir: partialclean-menhir

5950
boot/menhir/parser_menhir.ml → boot/menhir/parser.ml
View File

File diff suppressed because it is too large Load Diff

0
boot/menhir/parser_menhir.mli → boot/menhir/parser.mli
View File

1
driver/makedepend.ml
View File

@ -236,7 +236,6 @@ let rec lexical_approximation lexbuf =
- always skip the token after a backquote
*)
try
let module Parser = Parser_menhir in
let rec process after_lident lexbuf =
match Lexer.token lexbuf with
| Parser.UIDENT name ->

3
ocamldoc/stdlib_non_prefixed/.depend
View File

@ -101,8 +101,7 @@ outcometree.cmi : format.cmi asttypes.cmi
parmatch.cmi : types.cmi typedtree.cmi parsetree.cmi location.cmi \
hashtbl.cmi env.cmi asttypes.cmi
parse.cmi : parsetree.cmi lexing.cmi
parser.cmi : parsetree.cmi location.cmi lexing.cmi docstrings.cmi
parser_menhir.cmi : parsetree.cmi parser.cmi camlinternalMenhirLib.cmi lexing.cmi
parser.cmi : parsetree.cmi parser.cmi camlinternalMenhirLib.cmi lexing.cmi
parsetree.cmi : longident.cmi location.cmi asttypes.cmi
parsing.cmi : obj.cmi lexing.cmi
path.cmi : set.cmi map.cmi ident.cmi

6
parsing/lexer.mli
View File

@ -16,7 +16,7 @@
(* The lexical analyzer *)
val init : unit -> unit
val token: Lexing.lexbuf -> Parser_menhir.token
val token: Lexing.lexbuf -> Parser.token
val skip_hash_bang: Lexing.lexbuf -> unit
type error =
@ -39,7 +39,7 @@ val in_string : unit -> bool;;
val print_warnings : bool ref
val handle_docstrings: bool ref
val comments : unit -> (string * Location.t) list
val token_with_comments : Lexing.lexbuf -> Parser_menhir.token
val token_with_comments : Lexing.lexbuf -> Parser.token
(*
[set_preprocessor init preprocessor] registers [init] as the function
@ -54,5 +54,5 @@ changes its behavior to accept backslash-newline as a token-separating blank.
val set_preprocessor :
(unit -> unit) ->
((Lexing.lexbuf -> Parser_menhir.token) -> Lexing.lexbuf -> Parser_menhir.token) ->
((Lexing.lexbuf -> Parser.token) -> Lexing.lexbuf -> Parser.token) ->
unit

2
parsing/lexer.mll
View File

@ -18,7 +18,7 @@
{
open Lexing
open Misc
open Parser_menhir
open Parser
type error =
| Illegal_character of char

20
parsing/parse.ml
View File

@ -17,8 +17,6 @@
(* Skip tokens to the end of the phrase *)
module Parser = Parser_menhir
let last_token = ref Parser.EOF
let token lexbuf =
@ -66,7 +64,7 @@ let wrap parsing_fun lexbuf =
raise(Syntaxerr.Error(Syntaxerr.Other loc))
let rec loop lexbuf in_error checkpoint =
let module I = Parser_menhir.MenhirInterpreter in
let module I = Parser.MenhirInterpreter in
match checkpoint with
| I.InputNeeded _env ->
let triple =
@ -106,7 +104,7 @@ let rec loop lexbuf in_error checkpoint =
| I.Shifting _ | I.AboutToReduce _ ->
loop lexbuf in_error (I.resume checkpoint)
| I.Accepted v -> v
| I.Rejected -> raise Parser_menhir.Error
| I.Rejected -> raise Parser.Error
| I.HandlingError _ ->
loop lexbuf true (I.resume checkpoint)
@ -114,10 +112,10 @@ let wrap_menhir entry lexbuf =
let initial = entry lexbuf.Lexing.lex_curr_p in
wrap (fun lexbuf -> loop lexbuf false initial) lexbuf
let implementation = wrap_menhir Parser_menhir.Incremental.implementation
and interface = wrap_menhir Parser_menhir.Incremental.interface
and toplevel_phrase = wrap_menhir Parser_menhir.Incremental.toplevel_phrase
and use_file = wrap_menhir Parser_menhir.Incremental.use_file
and core_type = wrap_menhir Parser_menhir.Incremental.parse_core_type
and expression = wrap_menhir Parser_menhir.Incremental.parse_expression
and pattern = wrap_menhir Parser_menhir.Incremental.parse_pattern
let implementation = wrap_menhir Parser.Incremental.implementation
and interface = wrap_menhir Parser.Incremental.interface
and toplevel_phrase = wrap_menhir Parser.Incremental.toplevel_phrase
and use_file = wrap_menhir Parser.Incremental.use_file
and core_type = wrap_menhir Parser.Incremental.parse_core_type
and expression = wrap_menhir Parser.Incremental.parse_expression
and pattern = wrap_menhir Parser.Incremental.parse_pattern

0
parsing/parser_menhir.mly → parsing/parser.mly
View File

2
tools/Makefile
View File

@ -127,7 +127,7 @@ CSLPROF_IMPORTS=config.cmo build_path_prefix_map.cmo misc.cmo identifiable.cmo \
numbers.cmo arg_helper.cmo clflags.cmo terminfo.cmo \
warnings.cmo location.cmo longident.cmo docstrings.cmo \
syntaxerr.cmo ast_helper.cmo \
parser.cmo camlinternalMenhirLib.cmo parser_menhir.cmo \
camlinternalMenhirLib.cmo parser.cmo \
lexer.cmo parse.cmo
$(call byte_and_opt,ocamlprof,$(CSLPROF_IMPORTS) profiling.cmo $(CSLPROF),)