debugger: rename parser and lexer modules

This commit is contained in:
Florian Angeletti 2020-01-06 14:06:32 +01:00
parent e070c267e5
commit e667d9fb8d
8 changed files with 52 additions and 49 deletions

6
.gitignore vendored
View File

@ -73,9 +73,9 @@ _build
/bytecomp/opcodes.ml
/bytecomp/opcodes.mli
/debugger/lexer.ml
/debugger/parser.ml
/debugger/parser.mli
/debugger/debugger_lexer.ml
/debugger/debugger_parser.ml
/debugger/debugger_parser.mli
/debugger/ocamldebug
/emacs/ocamltags

View File

@ -54,13 +54,11 @@ command_line.cmo : \
primitives.cmi \
pos.cmi \
parser_aux.cmi \
parser.cmi \
parameters.cmi \
../parsing/longident.cmi \
../parsing/location.cmi \
loadprinter.cmi \
../utils/load_path.cmi \
lexer.cmi \
int64ops.cmi \
../bytecomp/instruct.cmi \
input_handling.cmi \
@ -70,6 +68,8 @@ command_line.cmo : \
eval.cmi \
../typing/envaux.cmi \
../typing/env.cmi \
debugger_parser.cmi \
debugger_lexer.cmi \
debugger_config.cmi \
debugcom.cmi \
../typing/ctype.cmi \
@ -92,13 +92,11 @@ command_line.cmx : \
primitives.cmx \
pos.cmx \
parser_aux.cmi \
parser.cmx \
parameters.cmx \
../parsing/longident.cmx \
../parsing/location.cmx \
loadprinter.cmx \
../utils/load_path.cmx \
lexer.cmx \
int64ops.cmx \
../bytecomp/instruct.cmx \
input_handling.cmx \
@ -108,6 +106,8 @@ command_line.cmx : \
eval.cmx \
../typing/envaux.cmx \
../typing/env.cmx \
debugger_parser.cmx \
debugger_lexer.cmx \
debugger_config.cmx \
debugcom.cmx \
../typing/ctype.cmx \
@ -139,6 +139,31 @@ debugger_config.cmx : \
int64ops.cmx \
debugger_config.cmi
debugger_config.cmi :
debugger_lexer.cmo : \
debugger_parser.cmi \
debugger_lexer.cmi
debugger_lexer.cmx : \
debugger_parser.cmx \
debugger_lexer.cmi
debugger_lexer.cmi : \
debugger_parser.cmi
debugger_parser.cmo : \
parser_aux.cmi \
../parsing/longident.cmi \
int64ops.cmi \
input_handling.cmi \
debugcom.cmi \
debugger_parser.cmi
debugger_parser.cmx : \
parser_aux.cmi \
../parsing/longident.cmx \
int64ops.cmx \
input_handling.cmx \
debugcom.cmx \
debugger_parser.cmi
debugger_parser.cmi : \
parser_aux.cmi \
../parsing/longident.cmi
eval.cmo : \
../typing/types.cmi \
../bytecomp/symtable.cmi \
@ -249,14 +274,6 @@ int64ops.cmo : \
int64ops.cmx : \
int64ops.cmi
int64ops.cmi :
lexer.cmo : \
parser.cmi \
lexer.cmi
lexer.cmx : \
parser.cmx \
lexer.cmi
lexer.cmi : \
parser.cmi
loadprinter.cmo : \
../typing/types.cmi \
../bytecomp/symtable.cmi \
@ -347,23 +364,6 @@ parameters.cmx : \
../utils/config.cmx \
parameters.cmi
parameters.cmi :
parser.cmo : \
parser_aux.cmi \
../parsing/longident.cmi \
int64ops.cmi \
input_handling.cmi \
debugcom.cmi \
parser.cmi
parser.cmx : \
parser_aux.cmi \
../parsing/longident.cmx \
int64ops.cmx \
input_handling.cmx \
debugcom.cmx \
parser.cmi
parser.cmi : \
parser_aux.cmi \
../parsing/longident.cmi
parser_aux.cmi : \
../parsing/longident.cmi \
debugcom.cmi
@ -490,13 +490,13 @@ program_management.cmx : \
program_management.cmi :
question.cmo : \
primitives.cmi \
lexer.cmi \
input_handling.cmi \
debugger_lexer.cmi \
question.cmi
question.cmx : \
primitives.cmx \
lexer.cmx \
input_handling.cmx \
debugger_lexer.cmx \
question.cmi
question.cmi :
show_information.cmo : \

View File

@ -68,11 +68,11 @@ compiler_modules := $(addprefix $(ROOTDIR)/,\
$(typing_modules) $(bytecomp_modules) $(other_compiler_modules))
debugger_modules := \
int64ops primitives unix_tools debugger_config parameters lexer \
int64ops primitives unix_tools debugger_config parameters debugger_lexer \
input_handling question debugcom exec source pos checkpoints events \
program_loading symbols breakpoints trap_barrier history printval \
show_source time_travel program_management frames eval \
show_information loadprinter parser command_line main
show_information loadprinter debugger_parser command_line main
all_modules := $(compiler_modules) $(debugger_modules)
@ -103,16 +103,16 @@ depend: beforedepend
$(CAMLDEP) $(DEPFLAGS) $(DEPINCLUDES) *.mli *.ml \
| sed -e 's,$(UNIXDIR)/,$$(UNIXDIR)/,' > .depend
lexer.ml: lexer.mll
debugger_lexer.ml: debugger_lexer.mll
$(CAMLLEX) $(OCAMLLEX_FLAGS) $<
clean::
rm -f lexer.ml
beforedepend:: lexer.ml
rm -f debugger_lexer.ml
beforedepend:: debugger_lexer.ml
parser.ml parser.mli: parser.mly
$(CAMLYACC) parser.mly
debugger_parser.ml debugger_parser.mli: debugger_parser.mly
$(CAMLYACC) debugger_parser.mly
clean::
rm -f parser.ml parser.mli
beforedepend:: parser.ml parser.mli
rm -f debugger_parser.ml debugger_parser.mli
beforedepend:: debugger_parser.ml debugger_parser.mli
include .depend

View File

@ -24,9 +24,9 @@ open Debugger_config
open Types
open Primitives
open Unix_tools
open Parser
open Debugger_parser
open Parser_aux
open Lexer
open Debugger_lexer
open Input_handling
open Question
open Debugcom
@ -45,6 +45,8 @@ open Checkpoints
open Frames
open Printval
module Lexer = Debugger_lexer
(** Instructions, variables and infos lists. **)
type dbg_instruction =
{ instr_name: string; (* Name of command *)

View File

@ -17,6 +17,6 @@
exception Int_overflow
val line: Lexing.lexbuf -> string
val lexeme: Lexing.lexbuf -> Parser.token
val argument: Lexing.lexbuf -> Parser.token
val line_argument: Lexing.lexbuf -> Parser.token
val lexeme: Lexing.lexbuf -> Debugger_parser.token
val argument: Lexing.lexbuf -> Debugger_parser.token
val line_argument: Lexing.lexbuf -> Debugger_parser.token

View File

@ -16,7 +16,7 @@
{
open Parser
open Debugger_parser
exception Int_overflow

View File

@ -15,6 +15,7 @@
open Input_handling
open Primitives
module Lexer = Debugger_lexer
(* Ask user a yes or no question. *)
let yes_or_no message =