Commit 5e5a217b authored by POTTIER Francois's avatar POTTIER Francois

Replaced [Objective Caml] with [OCaml] everywhere.

parent 4f721e30
...@@ -90,7 +90,7 @@ and datadef = { ...@@ -90,7 +90,7 @@ and datadef = {
and typ = and typ =
(* Textual Objective Caml type. *) (* Textual OCaml type. *)
| TypTextual of Stretch.ocamltype | TypTextual of Stretch.ocamltype
(* Type variable, without its leading quote. Can also be "_". *) (* Type variable, without its leading quote. Can also be "_". *)
...@@ -178,7 +178,7 @@ and expr = ...@@ -178,7 +178,7 @@ and expr =
| ERecordAccess of expr * string | ERecordAccess of expr * string
| ERecordWrite of expr * string * expr | ERecordWrite of expr * string * expr
(* Textual Objective Caml code. *) (* Textual OCaml code. *)
| ETextual of Stretch.t | ETextual of Stretch.t
(* Comments. *) (* Comments. *)
......
...@@ -43,7 +43,7 @@ bootstrap: .versioncheck stage1 stage2 stage3 ...@@ -43,7 +43,7 @@ bootstrap: .versioncheck stage1 stage2 stage3
# Checking the version of the OCaml compiler. # Checking the version of the OCaml compiler.
.versioncheck: .versioncheck:
@ echo Checking that Objective Caml is recent enough... @ echo Checking that OCaml is recent enough...
@$(OCAMLBUILD) -build-dir _stage1 checkOCamlVersion.byte @$(OCAMLBUILD) -build-dir _stage1 checkOCamlVersion.byte
@ _stage1/checkOCamlVersion.byte --verbose --gt "4.02" @ _stage1/checkOCamlVersion.byte --verbose --gt "4.02"
@ touch $@ @ touch $@
......
...@@ -63,7 +63,7 @@ grammar: ...@@ -63,7 +63,7 @@ grammar:
} }
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
/* A declaration is an %{ Objective Caml header %}, or a %token, %start, /* A declaration is an %{ OCaml header %}, or a %token, %start,
%type, %left, %right, or %nonassoc declaration. */ %type, %left, %right, or %nonassoc declaration. */
declaration: declaration:
......
...@@ -53,12 +53,12 @@ module Nonterminal : sig ...@@ -53,12 +53,12 @@ module Nonterminal : sig
The Boolean parameter tells whether the string representation The Boolean parameter tells whether the string representation
should be normalized, that is, whether parentheses and commas should be normalized, that is, whether parentheses and commas
should be eliminated. This is necessary if the string is intended should be eliminated. This is necessary if the string is intended
for use as a valid nonterminal name or as a valid Objective Caml for use as a valid nonterminal name or as a valid OCaml
identifier. *) identifier. *)
val print: bool -> t -> string val print: bool -> t -> string
(* This is the Objective Caml type associated with a nonterminal (* This is the OCaml type associated with a nonterminal
symbol. It is known only if a %type declaration was provided. symbol. It is known only if a %type declaration was provided.
This function is not applicable to the internally generated This function is not applicable to the internally generated
nonterminals. *) nonterminals. *)
...@@ -141,7 +141,7 @@ module Terminal : sig ...@@ -141,7 +141,7 @@ module Terminal : sig
val print: t -> string val print: t -> string
(* This is the Objective Caml type associated with a terminal (* This is the OCaml type associated with a terminal
symbol. It is known only if the %token declaration was symbol. It is known only if the %token declaration was
accompanied with a type. *) accompanied with a type. *)
......
...@@ -10,14 +10,14 @@ open TokenType ...@@ -10,14 +10,14 @@ open TokenType
(* The type variable associated with a nonterminal symbol. Its name begins (* The type variable associated with a nonterminal symbol. Its name begins
with a prefix which ensures that it begins with a lowercase letter and with a prefix which ensures that it begins with a lowercase letter and
cannot clash with Objective Caml keywords. *) cannot clash with OCaml keywords. *)
let ntvar symbol = let ntvar symbol =
Printf.sprintf "tv_%s" (Misc.normalize symbol) Printf.sprintf "tv_%s" (Misc.normalize symbol)
(* The term variable associated with a nonterminal symbol. Its name begins (* The term variable associated with a nonterminal symbol. Its name begins
with a prefix which ensures that it begins with a lowercase letter and with a prefix which ensures that it begins with a lowercase letter and
cannot clash with Objective Caml keywords. *) cannot clash with OCaml keywords. *)
let encode symbol = let encode symbol =
Printf.sprintf "xv_%s" (Misc.normalize symbol) Printf.sprintf "xv_%s" (Misc.normalize symbol)
......
...@@ -10,7 +10,7 @@ val ntvar: string -> string ...@@ -10,7 +10,7 @@ val ntvar: string -> string
val infer: UnparameterizedSyntax.grammar -> UnparameterizedSyntax.grammar val infer: UnparameterizedSyntax.grammar -> UnparameterizedSyntax.grammar
(* [depend grammar] prints (on the standard output channel) the (* [depend grammar] prints (on the standard output channel) the
Objective Caml dependencies induced by the semantic actions. OCaml dependencies induced by the semantic actions.
Then, it exits the program. *) Then, it exits the program. *)
val depend: UnparameterizedSyntax.grammar -> 'a val depend: UnparameterizedSyntax.grammar -> 'a
......
...@@ -253,7 +253,7 @@ let mk_stretch pos1 pos2 parenthesize monsters = ...@@ -253,7 +253,7 @@ let mk_stretch pos1 pos2 parenthesize monsters =
(* ------------------------------------------------------------------------ *) (* ------------------------------------------------------------------------ *)
(* Objective Caml's reserved words. *) (* OCaml's reserved words. *)
let reserved = let reserved =
let table = Hashtbl.create 149 in let table = Hashtbl.create 149 in
...@@ -404,7 +404,7 @@ rule main = parse ...@@ -404,7 +404,7 @@ rule main = parse
{ PLUS } { PLUS }
| (lowercase identchar *) as id | (lowercase identchar *) as id
{ if Hashtbl.mem reserved id then { if Hashtbl.mem reserved id then
error2 lexbuf "this is an Objective Caml reserved word." error2 lexbuf "this is an OCaml reserved word."
else else
LID (with_pos (cpos lexbuf) id) LID (with_pos (cpos lexbuf) id)
} }
...@@ -475,7 +475,7 @@ and ocamltype openingpos = parse ...@@ -475,7 +475,7 @@ and ocamltype openingpos = parse
| newline | newline
{ new_line lexbuf; ocamltype openingpos lexbuf } { new_line lexbuf; ocamltype openingpos lexbuf }
| eof | eof
{ error1 openingpos "unterminated Objective Caml type." } { error1 openingpos "unterminated OCaml type." }
| _ | _
{ ocamltype openingpos lexbuf } { ocamltype openingpos lexbuf }
...@@ -588,7 +588,7 @@ and ocamlcomment openingpos = parse ...@@ -588,7 +588,7 @@ and ocamlcomment openingpos = parse
| newline | newline
{ new_line lexbuf; ocamlcomment openingpos lexbuf } { new_line lexbuf; ocamlcomment openingpos lexbuf }
| eof | eof
{ error1 openingpos "unterminated Objective Caml comment." } { error1 openingpos "unterminated OCaml comment." }
| _ | _
{ ocamlcomment openingpos lexbuf } { ocamlcomment openingpos lexbuf }
...@@ -607,7 +607,7 @@ and string openingpos = parse ...@@ -607,7 +607,7 @@ and string openingpos = parse
unless it is a newline. Pretty crude, but should work. *) unless it is a newline. Pretty crude, but should work. *)
{ string openingpos lexbuf } { string openingpos lexbuf }
| eof | eof
{ error1 openingpos "unterminated Objective Caml string." } { error1 openingpos "unterminated OCaml string." }
| _ | _
{ string openingpos lexbuf } { string openingpos lexbuf }
......
...@@ -9,7 +9,7 @@ module Make (X : sig ...@@ -9,7 +9,7 @@ module Make (X : sig
val f: out_channel val f: out_channel
(* This controls the way we print Objective Caml stretches (types and (* This controls the way we print OCaml stretches (types and
semantic actions). We either surround them with #line directives semantic actions). We either surround them with #line directives
(for better error reports if the generated code is ill - typed) or (for better error reports if the generated code is ill - typed) or
don't (for better readability). The value is either [None] -- do don't (for better readability). The value is either [None] -- do
......
...@@ -6,7 +6,7 @@ module Make (X : sig ...@@ -6,7 +6,7 @@ module Make (X : sig
val f: out_channel val f: out_channel
(* This controls the way we print Objective Caml stretches (types and (* This controls the way we print OCaml stretches (types and
semantic actions). We either surround them with #line directives semantic actions). We either surround them with #line directives
(for better error reports if the generated code is ill-typed) or (for better error reports if the generated code is ill-typed) or
don't (for better readability). The value is either [None] -- do don't (for better readability). The value is either [None] -- do
......
...@@ -17,7 +17,7 @@ let tokentypeonly () = ...@@ -17,7 +17,7 @@ let tokentypeonly () =
let codeonly m = let codeonly m =
if String.capitalize m <> m then begin if String.capitalize m <> m then begin
(* Not using module [Error] to avoid a circular dependency. *) (* Not using module [Error] to avoid a circular dependency. *)
fprintf stderr "Error: %s is not a valid Objective Caml module name.\n" m; fprintf stderr "Error: %s is not a valid OCaml module name.\n" m;
exit 1 exit 1
end; end;
token_type_mode := CodeOnly m token_type_mode := CodeOnly m
...@@ -290,7 +290,7 @@ let () = ...@@ -290,7 +290,7 @@ let () =
(* ------------------------------------------------------------------------- *) (* ------------------------------------------------------------------------- *)
(* Menhir is able to suggest compile and link flags to be passed to the (* Menhir is able to suggest compile and link flags to be passed to the
Objective Caml compilers. If required, do so and stop. *) OCaml compilers. If required, do so and stop. *)
(* If [--table] is not passed, no flags are necessary. If [--table] is (* If [--table] is not passed, no flags are necessary. If [--table] is
passed, then [MenhirLib] needs to be visible (at compile time) and passed, then [MenhirLib] needs to be visible (at compile time) and
......
...@@ -17,7 +17,7 @@ type t = { ...@@ -17,7 +17,7 @@ type t = {
stretch_keywords : Keyword.keyword list stretch_keywords : Keyword.keyword list
} }
(* An Objective Caml type is either a stretch (if it was found in some (* An OCaml type is either a stretch (if it was found in some
source file) or a string (if it was inferred via [Infer]). *) source file) or a string (if it was inferred via [Infer]). *)
type ocamltype = type ocamltype =
......
...@@ -22,7 +22,7 @@ type filename = ...@@ -22,7 +22,7 @@ type filename =
type trailer = type trailer =
Stretch.t Stretch.t
(* Objective Caml semantic actions are represented as stretches. *) (* OCaml semantic actions are represented as stretches. *)
type action = type action =
Action.t Action.t
...@@ -61,11 +61,11 @@ and parameters = ...@@ -61,11 +61,11 @@ and parameters =
type declaration = type declaration =
(* Raw Objective Caml code. *) (* Raw OCaml code. *)
| DCode of Stretch.t | DCode of Stretch.t
(* Raw Objective Caml functor parameter. *) (* Raw OCaml functor parameter. *)
| DParameter of Stretch.ocamltype (* really a stretch *) | DParameter of Stretch.ocamltype (* really a stretch *)
......
...@@ -57,7 +57,7 @@ trailer: ...@@ -57,7 +57,7 @@ trailer:
{ Some (Lazy.force $1) } { Some (Lazy.force $1) }
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
/* A declaration is an %{ Objective Caml header %}, or a %token, %start, /* A declaration is an %{ OCaml header %}, or a %token, %start,
%type, %left, %right, or %nonassoc declaration. */ %type, %left, %right, or %nonassoc declaration. */
declarations: declarations:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment