Permalink
Browse files

[contrib] merge: pull request #9 from git://github.com/aszlig/opalang

  • Loading branch information...
2 parents 1201784 + 3f3d300 commit 628308ab4ad313807ed707d6bfc4fa639533f69c François-Régis Sinot committed Oct 4, 2011
Showing with 23 additions and 23 deletions.
  1. +8 −8 compilerlib/objectFiles.ml
  2. +3 −3 compilerlib/opadep.sh
  3. +1 −1 database/database_tool.ml
  4. +11 −11 opalib/opaEnv.ml
@@ -257,7 +257,7 @@ let load_conf conffile =
in
OManager.error (
"%a@\n" ^^
- "You should precise a @{<bright>package@} for @{<bright>%s@}@\n"^^
+ "You should supply a @{<bright>package@} for @{<bright>%s@}@\n"^^
"@[<2>@{<bright>Hint@}:@\nAdd a package declaration in a line before, using this syntax:@\n" ^^
"@[<2>mypackage:@\n" ^^
"%s@]@]@\n"
@@ -514,7 +514,7 @@ let find_dir_no_memo ((package_name, pos) : package) : filename =
~missing_file:(fun _dirs _fname ->
error (
"%a@\n Cannot find any object file for package @{<bright>%s@}.@\n" ^^
- "@[<2>@{<bright>Hint@}:@\nPerhaps some included directory are missing (option -I)@]"
+ "@[<2>@{<bright>Hint@}:@\nPerhaps some included directories are missing (option -I)@]"
)
FilePos.pp_pos pos package_name
)
@@ -540,7 +540,7 @@ let find_js_file_no_memo (js_file:basename) =
~missing_file:(fun _dirs _fname ->
error (
"Cannot find the file @{<bright>%s@}.@\n" ^^
- "@[<2>@{<bright>Hint@}:@\nPerhaps some included directory are missing (option -I)@]"
+ "@[<2>@{<bright>Hint@}:@\nPerhaps some included directories are missing (option -I)@]"
)
js_file
)
@@ -1115,7 +1115,7 @@ let merge_consistency_info ~exn (acc_js_libs, acc_deps, acc_bsl_plugins) package
error (
"@[<2>External plugin: conflicting versions for %S@\n"^^
"package @{<bright>%a@} uses @{<bright>%s@}@\n"^^
- "previous packages uses @{<bright>%s@}@]@\n"
+ "previous packages used @{<bright>%s@}@]@\n"
)
name
Package.pp package uniq_id
@@ -1208,7 +1208,7 @@ let browse_code_and_build_map_aux extract_package_decl filename lcode =
| Some p -> p :: names in
let pos_list = List.map snd names in
let pos = FilePos.merge_pos_list pos_list in
- OManager.serror "%a@\n The file %s declares several times its package."
+ OManager.serror "%a@\n Multiple package declarations in file %s."
FilePos.pp_pos pos filename;
Some h in
package_name, lcode, deps
@@ -1526,7 +1526,7 @@ let reorder :
| Some reason ->
let pp_reason f = function
| `static_include_changed -> Format.pp_print_string f "a file that is included statically has changed"
- | `conf_changed -> Format.pp_print_string f "the import of the package have been modified by a configuration file"
+ | `conf_changed -> Format.pp_print_string f "the import of the package has been modified by a configuration file"
| `not_complete -> Format.pp_print_string f "the package exists and is up-to-date but is not complete"
| `inconsistent s -> Format.fprintf f "the package exists, but is inconsistent (%s)" s
| `different_sources -> Format.pp_print_string f "the package exists, but was compiled from different sources"
@@ -1773,7 +1773,7 @@ struct
autobuild := Some false ;
turn_separated_on ();
()),
- " Recompile only what is needed, but does not link"
+ " Recompile only what is needed, but do not link"
;
(* c *)
@@ -1819,7 +1819,7 @@ struct
compilation_mode_state := `linking ;
turn_separated_on ();
()),
- " Add package(s) to link with (enfoce separated and linking modes)"
+ " Add package(s) to link with (enforce separated and linking modes)"
;
(* o *)
@@ -15,8 +15,8 @@ OPA_PACKAGES='lib/opa/stdlib'
help() {
cat <<EOF
opadep.sh: generate OPA packages dependency graphs.
-Packages to browser are found in the folder :
- . all package previously compiled in the current path
+Packages are expected to be found in the following folders :
+ . all packages previously compiled in the current path
MLSTATELIBS/$OPA_PACKAGES all installed packages
it generates a folder $OPADEP/ containing the resulting graphs.
@@ -152,4 +152,4 @@ for dot in *.dot ; do
done
odeplink *.svg
-echo "opadep: Successfull generation of graphs in $OPADEP/"
+echo "opadep: Successful generation of graphs in $OPADEP/"
@@ -89,7 +89,7 @@ let options =
"<timestamp>", "Use the database as it was at the given timestamp, instead of now (for -s and -d only)")
::
(["--backup"], ServerArg.func ServerArg.string (fun o s -> set_command o (Close (Backup s))),
- "<dirpath>", "Do a backup of the database, stored ati the given path. Local databases only")
+ "<dirpath>", "Do a backup of the database, stored at the given path. Local databases only")
::
List.map
(fun (arg,parse,params,help) -> arg, wrap_parser parse, params, help)
View
@@ -395,15 +395,15 @@ struct
let print_version () = prerr_endline str_version
let rpc_doc =
- "(i,p,c) Different level for optimize RPC (i : server values inserted on client code, p : publisehd functions, c : rpc call)"
+ "(i,p,c) Different level for RPC optimization (i : server values inserted on client code, p : published functions, c : rpc call)"
let set_rpc_options str =
try
Scanf.sscanf str
"(%d,%d,%d)"
(fun i p c -> rpc_options := (i,p,c))
with Failure _ | End_of_file | Scanf.Scan_failure _ ->
- OManager.error "An error occurs when parse rpc options@\n%s" rpc_doc
+ OManager.error "An error occured while parsing rpc options@\n%s" rpc_doc
(* ===== *)
(** Options which refers to (and so depends on, ...) options *)
@@ -421,7 +421,7 @@ where options are :
Arg.usage speclist head;
if not BuildInfos.is_release
then (
- prerr_endline "\nYou can set the following environment variable if needed (VAR MEANING DEFAULT):\n" ;
+ prerr_endline "\nYou can set the following environment variables if needed (VAR MEANING DEFAULT):\n" ;
List.iter (fun (var, mess, _)-> prerr_endline (Printf.sprintf " %s \t-- %s" (String.escaped var) mess)) Env.envvar ;
) ;
prerr_endline "\n-----------------------------\n"
@@ -456,7 +456,7 @@ where options are :
(* b *)
"--build-dir",
Arg.String (fun s -> build_dir := s),
- " set the build directory : default is _build. you must set an absolute path."
+ " set the build directory : default is _build. You must set an absolute path."
;
(* c *)
@@ -473,8 +473,8 @@ where options are :
("--compile-release", Arg.Set compile_release, " use this option to make a release : errors should be ignored, activate static file embedding.");
("--constant-sharing", Arg.Set constant_sharing, " Activate the constant sharing pass");
("--constant-sharing-client", Arg.Set constant_sharing, " Activate the constant sharing pass on javascript code");
- ("--no-constant-sharing", Arg.Clear constant_sharing, " Unactivate the constant sharing pass");
- ("--no-constant-sharing-client", Arg.Clear constant_sharing, " Unactivate the constant sharing pass on javascript code");
+ ("--no-constant-sharing", Arg.Clear constant_sharing, " Deactivate the constant sharing pass");
+ ("--no-constant-sharing-client", Arg.Clear constant_sharing, " Deactivate the constant sharing pass on javascript code");
("--dump-dbgen-schema", Arg.Set dump_dbgen_schema, " Dump the inferred dbgen schema (to files %.dot and %.png)");
("--extra-lib", Arg.String add_full_extra_lib, "\"*.cm*,*.js,...\" Add lib(s) to link the generated server");
("--extra-path", Arg.String add_full_extra_path, "\"dir,...\" Add path(s) to link the generated server");
@@ -568,7 +568,7 @@ where options are :
("--cps", Arg.Set cps, " Activate cps transformation mode");
("--cps-client", Arg.Set cps_client, " Activate cps transformation mode on client");
("--cps-toplevel-concurrency", Arg.Tuple [ Arg.Set cps ; Arg.Set cps_toplevel_concurrency ],
- " During cps transformation, toplevel not functionnal values are compiled as future (enforce --cps)");
+ " During cps transformation, toplevel non-functional values are compiled as future (enforce --cps)");
("--no-cps", Arg.Clear cps, "");
("--show-compilation", Arg.Set show_compilation, " show the caml compilation");
("--explicit-instantiation", Arg.Set explicit_instantiation, " Annotate instantiations of polymorphic functions and use the type information at runtime");
@@ -580,7 +580,7 @@ where options are :
"--hacker-mode",
Arg.Set hacker_mode,
- " Perform some usefull tricks when compiling the ocaml code for debugging purpose"
+ " Perform some useful tricks when compiling the ocaml code for debugging purpose"
;
"--js-back-end",
@@ -598,11 +598,11 @@ where options are :
("--no-cache-parse", Arg.Set no_cache_parse, " UNDOCUMENTED");
("--no-discard-of-unused-stdlib", Arg.Set no_discard_of_unused_stdlib, " UNDOCUMENTED");
("--no-embedded-stdlib",Arg.Clear embedded_opa, " Disable embedded stdlib usage");
- ("--no-undot", Arg.Unit (fun () -> undot := false), " Desactivate the optimization on module field calls");
+ ("--no-undot", Arg.Unit (fun () -> undot := false), " Deactivate the optimization on module field calls");
("--opa-walker", Arg.Unit (fun () -> opa_walker := Some true), " UNDOCUMENTED");
("--no-opa-walker", Arg.Unit (fun () -> opa_walker := Some false), " UNDOCUMENTED");
- ("--optimize-rpc", Arg.String set_rpc_options, "(i,p,c) Different level for optimize RPC (i : server values inserted on client code, p : publisehd functions, c : rpc call)");
+ ("--optimize-rpc", Arg.String set_rpc_options, "(i,p,c) Different level of RPC optimization (i : server values inserted on client code, p : published functions, c : rpc call)");
("--profile", Arg.Set profile, " UNDOCUMENTED");
("--set-opa-walker", Arg.Symbol (OpaWalker.Options.available_walkers, OpaWalker.Options.set_opa_walker), " UNDOCUMENTED");
("--slicer-test", Arg.Set slicer_test, " Make the slicer output specific information (and exit after it)");
@@ -689,7 +689,7 @@ where options are :
Arg.parse_argv ~current:(ref 0) opack_options speclist anon_fun ("")
with
| Arg.Bad message ->
- OManager.error "error by reading opack file @{<bright>%S@} :@\n%s@" file message
+ OManager.error "error while reading opack file @{<bright>%S@} :@\n%s@" file message
| Arg.Help _ ->
help_menu speclist () ;
OManager.error "error, the opack file @{<bright>%S@} contains the option --help" file

0 comments on commit 628308a

Please sign in to comment.