Permalink
Browse files

Updating: applying a grammar patch by Joshua Phillips.

  • Loading branch information...
1 parent a64f41e commit c1056d33a20aa2e45608af9a240fb26861678e81 Hongwei Xi committed Mar 14, 2012
View
@@ -905,7 +905,7 @@ fn d2exparg_dyn_get {n:nat} (
prerr ": the dynamic symbol [";
$Sym.prerr_symbol sym;
if nd2es > 2 then prerr "] expects two arguments but is given more.";
- if nd2es < 2 then prerr "] expects two arguments but is given less.";
+ if nd2es < 2 then prerr "] expects two arguments but is given fewer.";
prerr_newline ();
$Err.abort {void} ();
assert (nd2es = n) // deadcode
@@ -1231,7 +1231,7 @@ s2explst_arg_tyleq_solve (loc0, s2es10, s2es20) = let
prerr_loc_error3 (loc0);
$Deb.debug_prerrf (": %s: s2exp_arg_tyleq_solve", @(THISFILENAME));
if sgn > 0 then prerr ": this function call needs more arguments.";
- if sgn < 0 then prerr ": this function call needs less arguments.";
+ if sgn < 0 then prerr ": this function call needs fewer arguments.";
prerr_newline ();
$Err.abort {void} ();
assert (sgn = 0)
@@ -1311,7 +1311,7 @@ stasub_extend_sarglst_svarlst
//
fn err2 (loc0: loc_t): @(stasub, s2varlst) = begin
prerr_loc_error2 loc0;
- prerr ": the static application is expected to have less arguments.";
+ prerr ": the static application is expected to have fewer arguments.";
prerr_newline ();
$Err.abort ()
end // end of [err2]
@@ -1228,7 +1228,7 @@ fn c1lau_tr {n:nat} (n: int n, c1l: c1lau): c2lau n = let
prerr_loc_error2 c1l.c1lau_loc;
$Deb.debug_prerrf (": %s: c1lau_tr", @(THISFILENAME));
if np2ts < n then prerr ": this clause should contain more patterns.";
- if np2ts > n then prerr ": this clause should contain less patterns.";
+ if np2ts > n then prerr ": this clause should contain fewer patterns.";
prerr_newline ();
$Err.abort {void} ();
assert (np2ts = n) // deadcode
@@ -1677,8 +1677,8 @@ in
| _ => $Err.abort {d2exp} () where {
val n = $Lst.list_length d1es
val () = prerr_loc_error2 loc0
- val () = if n > 2 then prerr ": less argumnets should be given."
- val () = if n < 2 then prerr ": more argumnets should be given."
+ val () = if n > 2 then prerr ": fewer arguments should be given."
+ val () = if n < 2 then prerr ": more arguments should be given."
val () = prerr_newline ()
} // end of [_]
end // end of [D1Elist]
@@ -460,7 +460,7 @@ in
if ns1as <> ns2vs then begin
prerr_loc_error2 loc0;
if ns1as < ns2vs then prerr ": more static arguments should be given.";
- if ns1as > ns2vs then prerr ": less static arguments should be given.";
+ if ns1as > ns2vs then prerr ": fewer static arguments should be given.";
prerr_newline ();
$Err.abort {s2varlst} ()
end else begin
@@ -502,7 +502,7 @@ in
if ns1es <> ns2vs then begin
prerr_loc_error2 loc0;
if ns1es < ns2vs then prerr ": more template arguments should be given.";
- if ns1es > ns2vs then prerr ": less template arguments should be given.";
+ if ns1es > ns2vs then prerr ": fewer template arguments should be given.";
prerr_newline ();
$Err.abort {s2explst} ()
end else begin
@@ -607,7 +607,7 @@ and d1exp_arg_body_tr_ann (
val () = if npf1 <> npf2 then begin // check for pfarity match
prerr_loc_error2 d1e0.d1exp_loc;
$Deb.debug_prerrf (": %s: d1exp_arg_body_tr_ann", @(THISFILENAME));
- if npf1 < npf2 then prerr ": less proof arguments are expected.";
+ if npf1 < npf2 then prerr ": fewer proof arguments are expected.";
if npf1 > npf2 then prerr ": more proof arguments are expected.";
prerr_newline ();
$Err.abort {void} ()
@@ -628,7 +628,7 @@ and d1exp_arg_body_tr_ann (
if ns2es <> np2ts then begin
prerr_loc_error2 d1e0.d1exp_loc;
$Deb.debug_prerrf (": %s: d1exp_arg_body_tr_ann", @(THISFILENAME));
- if ns2es < np2ts then prerr ": less arguments are expected.";
+ if ns2es < np2ts then prerr ": fewer arguments are expected.";
if ns2es > np2ts then prerr ": more arguments are expected.";
prerr_newline ();
$Err.abort {p2atlst} ()
@@ -915,7 +915,7 @@ fn i1mpdec_tr
$Deb.debug_prerrf (": %s: i1mpdec_tr: aux2_imp", @(THISFILENAME));
prerr ": the implementation for [";
prerr q; prerr id;
- prerr "] should be applied to less template arguments.";
+ prerr "] should be applied to fewer template arguments.";
prerr_newline ();
$Err.abort {s2exp} ()
end // end of [nil]
@@ -960,7 +960,7 @@ fn i1mpdec_tr
$Deb.debug_prerrf (": %s: i1mpdec_tr: aux2_tmp", @(THISFILENAME));
prerr ": the implementation for [";
prerr q; prerr id;
- prerr "] should be applied to less template arguments.";
+ prerr "] should be applied to fewer template arguments.";
prerr_newline ();
$Err.abort {s2exp} ()
end // end of [nil]
@@ -341,7 +341,7 @@ fun sp1at_arg_tr_dn (
prerr_loc_error2 loc0;
prerr ": the static constructor [";
$Syn.prerr_s0taq q; $Sym.prerr_symbol id; prerr "] requires ";
- case+ s1as of list_cons _ => prerr "less" | _ => prerr "more";
+ case+ s1as of list_cons _ => prerr "fewer" | _ => prerr "more";
prerr " arguments.";
prerr_newline ();
$Err.abort {s2varlst} ()
@@ -557,7 +557,7 @@ fn s1exp_app_tr_up
| 1 => begin
prerr_loc_error2 loc_app;
$Deb.debug_prerrf (": %s: s1exp_app_tr_up", @(THISFILENAME));
- prerr ": the static application needs less arguments.";
+ prerr ": the static application needs fewer arguments.";
prerr_newline ();
$Err.abort ()
end // end of [1]
@@ -611,7 +611,7 @@ fn s1exp_app_datconptr_tr_up
$Deb.debug_prerrf (": %s: s1exp_app_datcon_tr_up", @(THISFILENAME));
prerr ": the type constructor [";
prerr d2c;
- prerr "] expects less arguments.";
+ prerr "] expects fewer arguments.";
prerr_newline ();
$Err.abort {void} ()
end // end of [if]
@@ -2229,7 +2229,7 @@ fn d1atcon_tr (
fn err1 (loc: loc_t, id: sym_t): s2explstopt = begin
prerr_loc_error2 loc;
- prerr ": less indexes are needed for the constructor [";
+ prerr ": fewer indexes are needed for the constructor [";
$Sym.prerr_symbol id; prerr "]"; prerr_newline ();
$Err.abort {s2explstopt} ()
end // end of [err1]
@@ -1362,7 +1362,7 @@ s2qua_instantiate_with_and_add
end // end of [list_cons, list_nil]
| (list_nil _, list_cons _) => begin
prerr_loc_error3 loc0;
- prerr ": the static application needs less arguments.";
+ prerr ": the static application needs fewer arguments.";
prerr_newline ();
$Err.abort {stasub_t} ()
end // end of [list_nil, list_cons]
@@ -386,7 +386,7 @@ fun labd2explst_tr_dn
| (LABD2EXPLSTcons (l1, _, _), LABS2EXPLSTnil ()) => begin
prerr_loc_error3 loc0;
$Deb.debug_prerrf (": %s: labd2explst_tr_dn", @(THISFILENAME));
- prerr ": the tuple/record needs less components";
+ prerr ": the tuple/record needs fewer components";
prerr ": a component with the label ["; prerr l1; prerr "] should be removed.";
prerr_newline ();
$Err.abort {labd3explst} ()
@@ -582,7 +582,7 @@ val d3e0 = case+ d2e0.d2exp_node of
val () = if npf <> npf_fun then begin // pfarity check
prerr_loc_error3 loc0;
prerr ": this function is expected to have";
- if npf > npf_fun then prerr " less proof arguments.";
+ if npf > npf_fun then prerr " fewer proof arguments.";
if npf < npf_fun then prerr " more proof arguments.";
prerr_newline ();
$Err.abort {void} ()
@@ -608,7 +608,7 @@ val d3e0 = case+ d2e0.d2exp_node of
if sgn <> 0 then begin
prerr_loc_error3 loc0;
prerr ": the funcion is expected to have";
- if sgn > 0 then prerr " less arguments.";
+ if sgn > 0 then prerr " fewer arguments.";
if sgn < 0 then prerr " more arguments.";
prerr_newline ();
$Err.abort ();
@@ -335,7 +335,7 @@ fn d23explst_tr_dn {n:nat} (
val () = prerr_loc_error3 loc0
val () = $Deb.debug_prerrf (": %s: d23explst_tr_dn", @(THISFILENAME))
val () = if sgn > 0 then
- prerr ": arity mismatch: less arguments are needed."
+ prerr ": arity mismatch: fewer arguments are needed."
val () = if sgn < 0 then
prerr ": arity mismatch: more arguments are needed."
val () = prerr_newline ()
@@ -209,7 +209,7 @@ fn pfarity_check
$Deb.debug_prerrf (": %s", @(THISFILENAME));
prerr ": pfarity_check: pfarity mismatch";
if npf1 < npf2 then prerr ": more proof components are needed.";
- if npf1 > npf2 then prerr ": less proof components are needed.";
+ if npf1 > npf2 then prerr ": fewer proof components are needed.";
prerr_newline ();
$Err.abort {void} ()
end // end of [if]
@@ -490,7 +490,7 @@ in
prerr loc0; prerr ": error(3)";
prerr ": the constructor ["; prerr d2c; prerr "] needs";
if np2ts < ns2es_arg then prerr " more arguments.";
- if np2ts > ns2es_arg then prerr " less arguments.";
+ if np2ts > ns2es_arg then prerr " fewer arguments.";
$Err.abort {void} ();
assert (np2ts = ns2es_arg) // deadcode
end else begin
@@ -701,7 +701,7 @@ in
| (list_nil (), list_nil ()) => stasub_nil
| (list_cons _, list_nil _) => begin
prerr loc0; prerr "error(3)";
- prerr ": the existentially quantified pattern needs less bound variables.";
+ prerr ": the existentially quantified pattern needs fewer bound variables.";
prerr_newline ();
$Err.abort {stasub_t} ()
end (* end of [list_cons, list_nil] *)

0 comments on commit c1056d3

Please sign in to comment.