Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cut overlong lines

master
Damien Doligez 2016-02-25 16:22:39 +01:00
parent 9614fca1ef
commit df75e7e9de
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
asmcomp/arm/emit.mlp
View File

@ -654,7 +654,8 @@ let emit_instr i =
| Ishiftor -> "orr" | Ishiftor -> "orr"
| Ishiftxor -> "eor") in | Ishiftxor -> "eor") in
let op = name_for_shift_operation shiftop in let op = name_for_shift_operation shiftop in
` {emit_string instr} {emit_reg i.res.(0)}, {emit_reg i.arg.(0)}, {emit_reg i.arg.(1)}, {emit_string op} #{emit_int n}\n`; 1 ` {emit_string instr} {emit_reg i.res.(0)}, {emit_reg i.arg.(0)}, \
{emit_reg i.arg.(1)}, {emit_string op} #{emit_int n}\n`; 1
| Lop(Ispecific(Irevsubimm n)) -> | Lop(Ispecific(Irevsubimm n)) ->
` rsb {emit_reg i.res.(0)}, {emit_reg i.arg.(0)}, #{emit_int n}\n`; 1 ` rsb {emit_reg i.res.(0)}, {emit_reg i.arg.(0)}, #{emit_int n}\n`; 1
| Lop(Ispecific(Imuladd | Imulsub as op)) -> | Lop(Ispecific(Imuladd | Imulsub as op)) ->

3
man/ocamlc.m
View File

@ -267,7 +267,8 @@ Enable or disable colors in compiler messages (especially warnings and errors).
The following modes are supported: The following modes are supported:
.B auto .B auto
use heuristics to enable colors only if the output supports them (an ANSI-compatible tty terminal); use heuristics to enable colors only if the output supports them (an
ANSI-compatible tty terminal);
.B always .B always
enable colors unconditionally; enable colors unconditionally;

3
parsing/pprintast.ml
View File

@ -1059,7 +1059,8 @@ class printer ()= object(self:'self)
pp f "(%a@;:%a)=@;%a" self#simple_pattern p pp f "(%a@;:%a)=@;%a" self#simple_pattern p
self#core_type ty self#expression x) self#core_type ty self#expression x)
| Pexp_constraint (e,t1),Ppat_var {txt;_} -> | Pexp_constraint (e,t1),Ppat_var {txt;_} ->
pp f "%a@;:@ %a@;=@;%a" protect_ident txt self#core_type t1 self#expression e pp f "%a@;:@ %a@;=@;%a" protect_ident txt self#core_type t1
self#expression e
| (_, Ppat_var _) -> | (_, Ppat_var _) ->
pp f "%a@ %a" self#simple_pattern p pp_print_pexp_function x pp f "%a@ %a" self#simple_pattern p pp_print_pexp_function x
| _ -> | _ ->

4
testsuite/tests/unwind/Makefile
View File

@ -13,9 +13,9 @@ default:
LD="`echo $$LDFULL | grep -o \"ld64-[0-9]*\"`"; \ LD="`echo $$LDFULL | grep -o \"ld64-[0-9]*\"`"; \
LDVER="`echo $$LD | sed \"s/ld64-//\"`"; \ LDVER="`echo $$LD | sed \"s/ld64-//\"`"; \
if [[ -z "$$LD" ]]; then \ if [[ -z "$$LD" ]]; then \
echo " => skipped (unknown linker: pattern ld64-[0-9]* not found in 'ld -v' output)"; \ echo " => skipped (ld64-[0-9]* not found in 'ld -v' output)"; \
elif [[ $$LDVER -lt 224 ]]; then \ elif [[ $$LDVER -lt 224 ]]; then \
echo " => skipped (ld version is $$LDVER, only 224 or above supported)"; \ echo " => skipped (ld version is $$LDVER < 224)"; \
else \ else \
$(MAKE) native_macosx_tests; \ $(MAKE) native_macosx_tests; \
fi; \ fi; \