Skip to content

Commit

Permalink
regenerate .nw from parsed .nw via syncweb -merge_files
Browse files Browse the repository at this point in the history
  • Loading branch information
pad committed Jan 31, 2015
1 parent c649885 commit 5282428
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion arch/dummy/dummy.nw
Expand Up @@ -331,7 +331,7 @@ let simple =

The [[return]] instruction for a possibly alternate return.

<<calling convention>>=
<<calling convention>>=
let return k n ~ra =
if k = 0 && n = 0
then store pc ra
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/mipscall.nw
Expand Up @@ -321,7 +321,7 @@ let spec =
@
<<mipscall.ml>>=
let c' ~return_to cut auto =
<<callspec specification>>
<<callspec specification>>
in
let t = CS.to_call cut (rtn return_to) auto spec in
{ t with (* fix what callspec got wrong *)
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/mipsrec.nw
Expand Up @@ -419,7 +419,7 @@ and loc = function
| RP.Slice _ -> error "cannot handle slice"
@

<<tail>>=
<<tail>>=
let effect = function
<<special cases for [[Store]]>>
| RP.Store(l,e,w) -> conStore (loc l) (exp e) w
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/x86asm.nw
Expand Up @@ -210,7 +210,7 @@ method value (v:Bits.bits) =
<<utilities>>=
let mask32 = Int64.pred (Int64.shift_left Int64.one 32)
@
<<assembly methods>>=
<<assembly methods>>=
method addr a =
match Reloc.if_bare a with
| Some b -> this#value b
Expand Down
6 changes: 3 additions & 3 deletions front_ir/opshape.nw
Expand Up @@ -201,14 +201,14 @@ let shape scheme = match scheme with
| [
<<'a>>
;
<<'a>>
<<'a>>
],
<<'a>>
<<'a>>
-> Binop ((), ())
| [
<<'a>>
],
<<'a>>
<<'a>>
-> Unop ()
| [
<<'a>>
Expand Down
6 changes: 3 additions & 3 deletions front_ir/proc.nw
Expand Up @@ -101,9 +101,9 @@ incoming overflow results, some deallocated by the
\end{itemize}

<<proc.mli>>=
<<type t>>
<<type t>>
@

<<proc.ml>>=
<<type t>>
<<proc.ml>>=
<<type t>>
@
8 changes: 4 additions & 4 deletions front_nelab/elabstmt.nw
Expand Up @@ -256,7 +256,7 @@ let arm (rgs, ss) =
| [] -> E.error "case arm has an empty range list"
| (rg, w) :: rgs ->
let strip w (rg, w') = if w = w' then rg else
<<exn on range type mismatch>>
<<exn on range type mismatch>>
in
((rg :: List.map (strip w) rgs), ss), w) in
@
Expand All @@ -266,11 +266,11 @@ We check this requirement and strip the width off everything in sight.
<<elaboration utilities>>=
let striprange w (rg, w') =
if w = w' then rg else
<<exn on case range type mismatch>>
<<exn on case range type mismatch>>
in
let striparms w =
let strip (arm, w') = if w = w' then arm else
<<exn on arm type mismatch>>
<<exn on arm type mismatch>>
in
List.map strip in
@
Expand Down Expand Up @@ -312,7 +312,7 @@ let assign lhs rhs =
try E.ematch (E.Raise.list (List.map2 effect lhs rhs)) (fun es ->
Assign (vrtl (srcmap, r) (Rtl.par es)))
with Invalid_argument _ ->
<<complain about length mismatch in assignment>>
<<complain about length mismatch in assignment>>
in
@
<<elaboration utilities>>=
Expand Down
2 changes: 1 addition & 1 deletion front_rtl/types.nw
Expand Up @@ -192,7 +192,7 @@ type size = Const of int
@

<<types.ml>>=
<<exported type definitions>>
<<exported type definitions>>
(* types from the interface definition *)
@
\emph{Rather than having a fixed operator [[Double]] we could implement a
Expand Down
2 changes: 1 addition & 1 deletion front_zipcfg/zipcfg.nw
Expand Up @@ -504,7 +504,7 @@ module Blocks : BLOCKS with type t = block UM.t = struct
let iter = UM.iter
end
@
<<zipcfg.ml>>=
<<zipcfg.ml>>=
type graph = Blocks.t
type zgraph = zblock * Blocks.t
type nodes = zgraph -> zgraph (* sequence of nodes in Hughes's representation *)
Expand Down

0 comments on commit 5282428

Please sign in to comment.