clean up whitespace and cut long lines

Author: damiendoligez

.gitattributes

@@ -9,16 +9,22 @@ boot/ocamldep binary
 *.png binary
 *.tfm binary
 
-.gitattributes           ocaml-typo=missing-header
-.gitignore               ocaml-typo=missing-header
-.merlin                  ocaml-typo=missing-header
-.ocp-indent              ocaml-typo=missing-header
-Changes                  ocaml-typo=non-ascii,missing-header
-CONTRIBUTING.md          ocaml-typo=missing-header
-INSTALL                  ocaml-typo=missing-header
-LICENSE                  ocaml-typo=non-printing,missing-header
+# No header for text files (would be too obtrusive).
+*.md                     ocaml-typo=missing-header
+README*                  ocaml-typo=missing-header
+*.adoc                   ocaml-typo=missing-header,long-line,unused-prop
+
+/.gitattributes           ocaml-typo=missing-header
+/.gitignore               ocaml-typo=missing-header
+/.merlin                  ocaml-typo=missing-header
+/Changes                  ocaml-typo=non-ascii,missing-header
+/INSTALL                  ocaml-typo=missing-header
+/LICENSE                  ocaml-typo=non-printing,missing-header
+/appveyor.yml             ocaml-typo=long-line,very-long-line
+
 
 asmcomp/*/emit.mlp       ocaml-typo=tab,long-line,unused-prop
+asmcomp/power/NOTES.md   ocaml-typo=missing-header,long-line
 
 asmrun/i386.S            ocaml-typo=long-line
 
@@ -27,10 +33,11 @@ config/gnu               ocaml-typo=prune
 emacs/*.el               ocaml-typo=long-line,unused-prop
 emacs/COPYING            ocaml-typo=tab,non-printing,missing-header
 emacs/ocamltags.in       ocaml-typo=non-printing
-emacs/README*            ocaml-typo=missing-header
 
 experimental             ocaml-typo=prune
 
+manual                   ocaml-typo=prune
+
 ocamlbuild/*             ocaml-typo=long-line
 ocamlbuild/AUTHORS       ocaml-typo=missing-header
 ocamlbuild/ChangeLog     ocaml-typo=tab,missing-header
@@ -43,6 +50,17 @@ otherlibs/win32unix/readlink.c    ocaml-typo=long-line
 otherlibs/win32unix/stat.c        ocaml-typo=long-line
 otherlibs/win32unix/symlink.c     ocaml-typo=long-line
 
+stdlib/sharpbang    ocaml-typo=white-at-eol,missing-lf
+
+# FIXME remove headers in testsuite and remove unused-prop in next line:
+testsuite/**        ocaml-typo=missing-header,unused-prop
+testsuite/tests/lib-bigarray-2/bigarrf.f  ocaml-typo=missing-header,tab
+testsuite/tests/misc-unsafe/almabench.ml  ocaml-typo=missing-header,long-line
+
+tools/magic         ocaml-typo=missing-header
+
+yacc/*.[ch]   ocaml-typo=long-line,very-long-line,unused-prop
+
 # Line-ending specifications, for Windows interoperability
 *.sh text eol=lf
 *.sh.in text eol=lf

.gitignore

@@ -274,6 +274,8 @@
 /testsuite/tests/unboxed-primitive-args/main.ml
 /testsuite/tests/unboxed-primitive-args/stubs.c
 
+/testsuite/tests/unwind/unwind_test
+
 /testsuite/tests/warnings/w55.opt.opt_result
 /testsuite/tests/warnings/w58.opt.opt_result
 

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "flexdll"]
-	path = flexdll
-	url = https://github.com/alainfrisch/flexdll.git
+    path = flexdll
+    url = https://github.com/alainfrisch/flexdll.git

INSTALL.adoc

@@ -234,9 +234,9 @@ or:
         make opt > log.opt 2>&1     # in sh
         make opt >& log.opt         # in csh
 
-5. anchor:step-5[] Compile fast versions of the OCaml compilers, by compiling them
-with the native-code compiler (you have only compiled them to bytecode
-so far).  Just do:
+5. anchor:step-5[] Compile fast versions of the OCaml compilers, by
+compiling them with the native-code compiler (you have only compiled
+them to bytecode so far).  Just do:
 
         make opt.opt
 +

Makefile

@@ -367,7 +367,8 @@ partialclean::
 	rm -f compilerlibs/ocamlopttoplevel.cmxa
 
 ocamlnat: compilerlibs/ocamlcommon.cmxa compilerlibs/ocamloptcomp.cmxa \
-    otherlibs/dynlink/dynlink.cmxa compilerlibs/ocamlopttoplevel.cmxa $(OPTTOPLEVELSTART:.cmo=.cmx)
+    otherlibs/dynlink/dynlink.cmxa compilerlibs/ocamlopttoplevel.cmxa \
+    $(OPTTOPLEVELSTART:.cmo=.cmx)
 	$(CAMLOPT) $(LINKFLAGS) -linkall -o ocamlnat \
 	    otherlibs/dynlink/dynlink.cmxa compilerlibs/ocamlcommon.cmxa \
 	    compilerlibs/ocamloptcomp.cmxa compilerlibs/ocamlopttoplevel.cmxa \
@@ -480,7 +481,8 @@ ocamlopt.opt: compilerlibs/ocamlcommon.cmxa compilerlibs/ocamloptcomp.cmxa \
 partialclean::
 	rm -f ocamlopt.opt
 
-$(COMMON:.cmo=.cmx) $(BYTECOMP:.cmo=.cmx) $(MIDDLE_END:.cmo=.cmx) $(ASMCOMP:.cmo=.cmx): ocamlopt
+$(COMMON:.cmo=.cmx) $(BYTECOMP:.cmo=.cmx) $(MIDDLE_END:.cmo=.cmx) \
+$(ASMCOMP:.cmo=.cmx): ocamlopt
 
 # The numeric opcodes
 
@@ -747,7 +749,8 @@ clean::
 	$(CAMLOPT) $(COMPFLAGS) -c $<
 
 partialclean::
-	for d in utils parsing typing bytecomp asmcomp middle_end middle_end/base_types driver toplevel tools; \
+	for d in utils parsing typing bytecomp asmcomp middle_end \
+	         middle_end/base_types driver toplevel tools; \
 	  do rm -f $$d/*.cm[ioxt] $$d/*.cmti $$d/*.annot $$d/*.[so] $$d/*~; done
 	rm -f *~
 

Makefile.nt

@@ -16,48 +16,55 @@ include Makefile.shared
 
 # For users who don't read the INSTALL file
 defaultentry:
-	@echo "Please refer to the installation instructions in file README.win32.adoc."
+	@echo "Please refer to the instructions in file README.win32.adoc."
 
 FLEXDLL_SUBMODULE_PRESENT:=$(wildcard flexdll/Makefile)
-BOOT_FLEXLINK_CMD=$(if $(FLEXDLL_SUBMODULE_PRESENT),FLEXLINK_CMD="../boot/ocamlrun ../flexdll/flexlink.exe")
-CAMLOPT:=$(if $(FLEXDLL_SUBMODULE_PRESENT),OCAML_FLEXLINK="boot/ocamlrun flexdll/flexlink.exe") $(CAMLOPT)
+ifeq "$(FLEXDLL_SUBMODULE_PRESENT)" ""
+  BOOT_FLEXLINK_CMD=
+else
+  BOOT_FLEXLINK_CMD=FLEXLINK_CMD="../boot/ocamlrun ../flexdll/flexlink.exe"
+  CAMLOPT:=OCAML_FLEXLINK="boot/ocamlrun flexdll/flexlink.exe" $(CAMLOPT)
+endif
 
 # FlexDLL sources missing error messages
 # Different git mechanism displayed depending on whether this source tree came
 # from a git clone or a source tarball.
 
-# Displayed in all cases
-flexdll-common-err:
-	@echo In order to bootstrap FlexDLL, you need to place the sources in flexdll
+flexdll/Makefile:
+	@echo In order to bootstrap FlexDLL, you need to place the sources in
+	@echo flexdll.
 	@echo This can either be done by downloading a source tarball from
 	@echo \  http://alain.frisch.fr/flexdll.html
-
-flexdll/Makefile: $(if $(wildcard flexdll/Makefile),,$(if $(wildcard .git),flexdll-common-err,flexdll-repo))
-	@echo or by checking out the flexdll submodule with
-	@echo \  git submodule update --init
-	@false
-
-flexdll-repo: flexdll-common-err
-	@echo or by cloning the git repository
-	@echo \  git clone https://github.com/alainfrisch/flexdll.git
-	@echo
+	@if [ -d .git ]; then \
+	  echo or by checking out the flexdll submodule with; \
+	  echo \  git submodule update --init; \
+	else \
+	  echo or by cloning the git repository; \
+	  echo \  git clone https://github.com/alainfrisch/flexdll.git; \
+	fi
 	@false
 
 # Bootstrapping FlexDLL - leaves a bytecode image of flexlink.exe in flexdll/
 flexdll: flexdll/Makefile
-	cd byterun ; $(MAKEREC) BOOTSTRAPPING_FLEXLINK=yes ocamlrun$(EXE)
+	cd byterun && $(MAKEREC) BOOTSTRAPPING_FLEXLINK=yes ocamlrun$(EXE)
 	cp byterun/ocamlrun.exe boot/ocamlrun.exe
-	cd stdlib ; $(MAKEREC) COMPILER=../boot/ocamlc stdlib.cma std_exit.cmo
-	cd stdlib ; cp stdlib.cma std_exit.cmo *.cmi ../boot
-	cd flexdll ; $(MAKECMD) MSVC_DETECT=0 TOOLCHAIN=$(TOOLCHAIN) TOOLPREF=$(TOOLPREF) CHAINS=$(FLEXDLL_CHAIN) NATDYNLINK=false OCAMLOPT="../boot/ocamlrun ../boot/ocamlc -I ../boot" flexlink.exe support
-	cd byterun ; $(MAKEREC) clean
+	cd stdlib && $(MAKEREC) COMPILER=../boot/ocamlc stdlib.cma std_exit.cmo
+	cd stdlib && cp stdlib.cma std_exit.cmo *.cmi ../boot
+	cd flexdll && \
+	 $(MAKECMD) MSVC_DETECT=0 TOOLCHAIN=$(TOOLCHAIN) TOOLPREF=$(TOOLPREF) \
+	            CHAINS=$(FLEXDLL_CHAIN) NATDYNLINK=false \
+	            OCAMLOPT="../boot/ocamlrun ../boot/ocamlc -I ../boot" \
+	            flexlink.exe support
+	cd byterun && $(MAKEREC) clean
 	$(MAKEREC) partialclean
 
 flexlink.opt:
-	cd flexdll ; \
-	mv flexlink.exe flexlink ; \
-	$(MAKECMD) OCAML_FLEXLINK="../boot/ocamlrun ./flexlink" MSVC_DETECT=0 TOOLCHAIN=$(TOOLCHAIN) TOOLPREF=$(TOOLPREF) OCAMLOPT="../ocamlopt.opt -I ../stdlib" flexlink.exe ; \
-	mv flexlink.exe flexlink.opt ; \
+	cd flexdll && \
+	mv flexlink.exe flexlink && \
+	$(MAKECMD) OCAML_FLEXLINK="../boot/ocamlrun ./flexlink" MSVC_DETECT=0 \
+	           TOOLCHAIN=$(TOOLCHAIN) TOOLPREF=$(TOOLPREF) \
+	           OCAMLOPT="../ocamlopt.opt -I ../stdlib" flexlink.exe && \
+	mv flexlink.exe flexlink.opt && \
 	mv flexlink flexlink.exe
 
 # Recompile the system using the bootstrap compiler
@@ -150,7 +157,7 @@ compare:
          && $(CAMLRUN) tools/cmpbyt boot/ocamldep tools/ocamldep; \
 	then echo "Fixpoint reached, bootstrap succeeded."; \
 	else echo "Fixpoint not reached, try one more bootstrapping cycle."; \
-	fi	
+	fi
 
 # Remove old bootstrap compilers
 cleanboot:
@@ -229,28 +236,36 @@ installbyt:
 
 install-flexdll:
 # The $(if ...) installs the correct .manifest file for MSVC and MSVC64
-# (GNU make doesn't have ifeq as a function, hence slightly convoluted use of filter-out)
-	cp flexdll/flexlink.exe $(if $(filter-out mingw,$(TOOLCHAIN)),flexdll/default$(filter-out _i386,_$(ARCH)).manifest) $(INSTALL_BINDIR)/
+# (GNU make doesn't have ifeq as a function, hence slightly convoluted use of
+#  filter-out)
+	cp flexdll/flexlink.exe \
+	   $(if $(filter-out mingw,$(TOOLCHAIN)),\
+	     flexdll/default$(filter-out _i386,_$(ARCH)).manifest) \
+	   $(INSTALL_BINDIR)/
 	cp flexdll/flexdll_*.$(O) $(INSTALL_LIBDIR)
 
 # Installation of the native-code compiler
 installopt:
-	cd asmrun ; $(MAKEREC) install
+	cd asmrun && $(MAKEREC) install
 	cp ocamlopt "$(INSTALL_BINDIR)/ocamlopt.exe"
-	cd stdlib ; $(MAKEREC) installopt
+	cd stdlib && $(MAKEREC) installopt
 	cp middle_end/*.cmi middle_end/*.cmt middle_end/*.cmti \
 		"$(INSTALL_COMPLIBDIR)"
 	cp middle_end/base_types/*.cmi middle_end/base_types/*.cmt \
 		middle_end/base_types/*.cmti "$(INSTALL_COMPLIBDIR)"
 	cp asmcomp/*.cmi asmcomp/*.cmt asmcomp/*.cmti "$(INSTALL_COMPLIBDIR)"
 	cp compilerlibs/ocamloptcomp.cma $(OPTSTART) "$(INSTALL_COMPLIBDIR)"
-	if test -n "$(WITH_OCAMLDOC)"; then (cd ocamldoc; $(MAKEREC) installopt); fi
+	if test -n "$(WITH_OCAMLDOC)"; then \
+	  (cd ocamldoc && $(MAKEREC) installopt); \
+	fi
 	for i in $(OTHERLIBRARIES); do \
 	  $(MAKEREC) -C otherlibs/$$i installopt || exit $$?; \
 	done
 	if test -f ocamlopt.opt ; then $(MAKEREC) installoptopt; fi
 	cd tools; $(MAKEREC) installopt
-	if test -f ocamlopt.opt -a -f flexdll/flexlink.opt ; then cp -f flexdll/flexlink.opt $(INSTALL_BINDIR)/flexlink.exe ; fi
+	if test -f ocamlopt.opt -a -f flexdll/flexlink.opt ; then \
+	  cp -f flexdll/flexlink.opt $(INSTALL_BINDIR)/flexlink.exe ; \
+	fi
 
 installoptopt:
 	cp ocamlc.opt "$(INSTALL_BINDIR)/ocamlc.opt$(EXE)"
@@ -441,7 +456,8 @@ ocamlopt.opt: compilerlibs/ocamlcommon.cmxa compilerlibs/ocamloptcomp.cmxa \
 partialclean::
 	rm -f ocamlopt.opt
 
-$(COMMON:.cmo=.cmx) $(BYTECOMP:.cmo=.cmx) $(MIDDLE_END:.cmo=.cmx) $(ASMCOMP:.cmo=.cmx): ocamlopt
+$(COMMON:.cmo=.cmx) $(BYTECOMP:.cmo=.cmx) $(MIDDLE_END:.cmo=.cmx) \
+$(ASMCOMP:.cmo=.cmx): ocamlopt
 
 # The numeric opcodes
 

Makefile.shared

@@ -19,8 +19,8 @@ include stdlib/StdlibModules
 
 CAMLC=$(CAMLRUN) boot/ocamlc -g -nostdlib -I boot
 CAMLOPT=$(CAMLRUN) ./ocamlopt -g -nostdlib -I stdlib -I otherlibs/dynlink
-COMPFLAGS=-strict-sequence -principal -w +33..39+48+50 -warn-error A -bin-annot \
-          -safe-string -strict-formats $(INCLUDES)
+COMPFLAGS=-strict-sequence -principal -w +33..39+48+50 -warn-error A \
+          -bin-annot -safe-string -strict-formats $(INCLUDES)
 LINKFLAGS=
 
 YACCFLAGS=-v
@@ -234,4 +234,3 @@ partialclean::
 
 alldepend::
 	cd tools; $(MAKEREC) depend
-

README.adoc

@@ -60,7 +60,7 @@ renaming of standard library functions.
   config/::               autoconfiguration stuff
   debugger/::             source-level replay debugger
   driver/::               driver code for the compilers
-  emacs/::                OCaml editing mode and debugger interface for GNU Emacs
+  emacs/::                editing mode and debugger interface for GNU Emacs
   lex/::                  lexer generator
   maccaml/::              the Macintosh GUI
   ocamldoc/::             documentation generator

README.win32.adoc

@@ -87,15 +87,16 @@ for Windows.
 You will need the following software components to perform the recompilation:
 
 - Windows NT, 2000, XP, Vista, or 7 (32 or 64 bits).
-- Items <<tps1,[1]>> and <<tps2,[2]>> from the list of recommended software above.
+- Items <<tps1,[1]>> and <<tps2,[2]>> from the list of recommended software
+  above.
 - The Cygwin port of GNU tools, available from http://www.cygwin.com/
   Install at least the following packages (and their dependencies):
   diffutils, dos2unix, gcc-core, make, ncurses.
 
 First, you need to set up your cygwin environment for using the MS
-tools.  The following assumes that you have installed <<tps1,[1]>>, <<tps2,[2]>>, and [3]
-in their default directories.  If this is not the case, you will need
-to adjust the paths accordingly.
+tools.  The following assumes that you have installed <<tps1,[1]>>,
+<<tps2,[2]>>, and [3] in their default directories.  If this is not
+the case, you will need to adjust the paths accordingly.
 
 . Open a Windows Command Prompt and enter the following command:
 
@@ -408,14 +409,15 @@ for Windows.
 
 You will need the following software components to perform the recompilation:
 - Windows XP 64, Windows Server 64, or Windows 7 64.
-- Items <<tps-native1,[1]>> and <<tps-native2,[2]>> from the list of recommended software above.
+- Items <<tps-native1,[1]>> and <<tps-native2,[2]>> from the list of
+  recommended software above.
 - The Cygwin port of GNU tools, available from http://www.cygwin.com/
   Install at least the following packages: diffutils, make, ncurses.
 
 First, you need to set up your cygwin environment for using the MS
-tools.  The following assumes that you have installed <<tps-native1,[1]>> and <<tps-native2,[2]>>
-in their default directories.  If this is not the case, you will need
-to adjust the paths accordingly.
+tools.  The following assumes that you have installed <<tps-native1,[1]>>
+and <<tps-native2,[2]>> in their default directories.  If this is not
+the case, you will need to adjust the paths accordingly.
 
 . Open a Windows Command Prompt and enter the following commands:
 

asmcomp/amd64/NOTES.md

@@ -19,4 +19,3 @@ Debian architecture name: `amd64`
   _OS X ABI Function Call Guide: x86-64 Function Calling Conventions_
 * Windows 64 application binary interface:
   _x64 Software Conventions_ from MSDN
-

asmcomp/arm/NOTES.md

@@ -18,4 +18,3 @@ Debian architecture names: `armel` and `armhf`.
   _ARM Architecture Reference Manual, ARMv8_, restricted to the AArch32 subset.
 * Application binary interface:
   _Procedure Call Standard for the ARM Architecture_
-

asmcomp/i386/NOTES.md

@@ -20,8 +20,3 @@ Debian architecture name: `i386`
    Intel386 Architecture Processor Supplement_
 * MacOS X application binary interface:
   _OS X ABI Function Call Guide: IA-32 Function Calling Conventions_
-
-
-
-
-

asmcomp/power/NOTES.md

@@ -10,18 +10,17 @@ No longer supported: AIX and MacOS X.
 # Reference documents
 
 * Instruction set architecture:
-  _PowerPC User Instruction Set Architecture_, 
+  _PowerPC User Instruction Set Architecture_,
   book 1 of _PowerPC Architecture Book_
- (http://www.ibm.com/developerworks/systems/library/es-archguide-v2.html).
+  (http://www.ibm.com/developerworks/systems/library/es-archguide-v2.html).
 * ELF ABI 32 bits:
-  _System V Application Binary Interface, PowerPC Processor Supplement_ 
+  _System V Application Binary Interface, PowerPC Processor Supplement_
 * ELF ABI 64 bits version 1:
-  _64-bit PowerPC ELF Application Binary Interface Supplement_ 
+  _64-bit PowerPC ELF Application Binary Interface Supplement_
   (http://refspecs.linuxfoundation.org/ELF/ppc64/PPC-elf64abi.html)
 * ELF ABI 64 bits version 2:
    _Power Architecture 64-bit ELF V2 ABI Specification,
     OpenPOWER ABI for Linux Supplement_
   (http://openpowerfoundation.org/technical/technical-resources/technical-specifications/)
 * _The PowerPC Compiler Writer's Guide_, Warthman Associates, 1996.
   (PDF available from various sources on the Web.)
-

asmcomp/s390x/NOTES.md

@@ -6,14 +6,11 @@ running Linux (Debian architecture: `s390x`).
 # Reference documents
 
 * Instruction set architecture:
-   _z/Architecture Principles of Operation_, 
+   _z/Architecture Principles of Operation_,
    SA22-7832-07, eight edition (Feb 2009).
    This is the version that corresponds to z10.
    Newer versions of this manual include additional instructions
    that are not in z10.
 * ELF ABI:
    _zSeries ELF Application Binary Interface Supplement_
    (http://refspecs.linuxfoundation.org/ELF/zSeries/index.html)
-
-
-

asmcomp/sparc/NOTES.md

@@ -15,7 +15,3 @@ Status of this port: nearly abandoned
 * ELF application binary interface:
   _System V Application Binary Interface,
    SPARC Processor Supplement_
-
-
-
-