diff options
| author | Peter Sewell | 2014-11-23 16:59:59 +0000 |
|---|---|---|
| committer | Peter Sewell | 2014-11-23 16:59:59 +0000 |
| commit | d9d63b005c571b26cfcde8cdbfdf20f6aa39c563 (patch) | |
| tree | 6b323994c8c756dc035acfcb19baa278204e2cbc /src/lem_interp | |
| parent | 9d61b77442d75685c533e2c0e4c8a75bc219b792 (diff) | |
| parent | 488587ef0c9d6ff5ef35692510e8cf30bcad4fed (diff) | |
Merge branch 'master' of bitbucket.org:Peter_Sewell/l2
Conflicts:
src/lem_interp/printing_functions.ml
Diffstat (limited to 'src/lem_interp')
| -rw-r--r-- | src/lem_interp/printing_functions.ml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/lem_interp/printing_functions.ml b/src/lem_interp/printing_functions.ml index 46c7d227..42845cd8 100644 --- a/src/lem_interp/printing_functions.ml +++ b/src/lem_interp/printing_functions.ml @@ -397,7 +397,6 @@ let rec instr_parms_to_string ps = let pad n s = if String.length s < n then s ^ String.make (n-String.length s) ' ' else s let instruction_to_string (name, parms, base_effects) = -(* "TODO instruction_to_string"*) (pad 5 (String.lowercase name)) ^ " " ^ instr_parms_to_string parms let print_backtrace_compact printer stack = List.iter (fun (e,(env,mem)) -> print_exp printer env e) (compact_stack stack) |