Skip to content

Commit

Permalink
remove remaining trailing whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
jakebolewski authored and tkelman committed Jan 19, 2015
1 parent 239ca2f commit 6cd421c
Show file tree
Hide file tree
Showing 45 changed files with 262 additions and 265 deletions.
18 changes: 9 additions & 9 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,24 +50,24 @@ For developers who need to wrap C libraries so that they can be called from Juli

Julia's documentation is stored in the `doc` directory, and like everything else can be modified using `git`. However, for small changes one can also use GitHub's web interface:

- Navigate to https://github.com/JuliaLang/julia
- Click `doc`
- Navigate to https://github.com/JuliaLang/julia
- Click `doc`
- If you want to modify an entry in the help for Julia's standard library, click `stdlib`
- Pick the file you want to edit (for example, `base.rst`)
- Select the `master` branch (if not browsing it already)
- Click "Edit"
- Click on the icon that looks like a fullscreen symbol ("Zen" mode)
- Click "Edit"
- Click on the icon that looks like a fullscreen symbol ("Zen" mode)
- Search for the function you want to change
- Make your changes
- Exit Zen mode
- Provide a title, and optionally a longer description of your change
- Make your changes
- Exit Zen mode
- Provide a title, and optionally a longer description of your change
- Submit your change

Julia's documentation is built with [Sphinx](http:https://sphinx-doc.org/contents.html), which supports (and Julia's docs rely heavily on) [ReST directives](http:https://docutils.sourceforge.net/docs/ref/rst/directives.html). To build the documentation locally, run

make -C doc html

or
or

make -C doc latex

Expand All @@ -86,7 +86,7 @@ Add new code to Julia's base libraries as follows:
1. Edit the appropriate file in the `base/` directory, or add new files if necessary. Create tests for your functionality and add them to files in the `test/` directory. If you're editing C or Scheme code, most likely it lives in `src/` or one of its subdirectories, although some aspects of Julia's REPL initialization live in `ui/`.

2. Add any new files to `sysimg.jl` in order to build them into the Julia system image.

3. Add any necessary export symbols in `exports.jl`.

4. Include your tests in `test/Makefile` and `test/runtests.jl`.
Expand Down
8 changes: 4 additions & 4 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ for exceptions.

> Copyright (c) 2009-2014: Jeff Bezanson, Stefan Karpinski, Viral B. Shah,
> and other contributors:
>
>
> https://github.com/JuliaLang/julia/contributors
>
>
> Permission is hereby granted, free of charge, to any person obtaining
> a copy of this software and associated documentation files (the
> "Software"), to deal in the Software without restriction, including
> without limitation the rights to use, copy, modify, merge, publish,
> distribute, sublicense, and/or sell copies of the Software, and to
> permit persons to whom the Software is furnished to do so, subject to
> the following conditions:
>
>
> The above copyright notice and this permission notice shall be
> included in all copies or substantial portions of the Software.
>
>
> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
Expand Down
4 changes: 2 additions & 2 deletions Make.inc
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ FC_BASE = $(CROSS_COMPILE)gfortran
endif
FC = $(FC_BASE)

STDLIBCPP_FLAG =
STDLIBCPP_FLAG =

ifeq ($(OS), Darwin)
DARWINVER := $(shell uname -r | cut -b 1-2)
Expand All @@ -260,7 +260,7 @@ else
ifeq ($(DARWINVER_GTE13),1)
USE_LIBCPP = 1
STDLIBCPP_FLAG = -stdlib=libstdc++
else
else
USE_LIBCPP = 0
endif
USEGCC = 0
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ endif
ifeq ($(USE_SYSTEM_LIBUV),0)
ifeq ($(OS),WINNT)
$(INSTALL_F) $(build_includedir)/tree.h $(DESTDIR)$(includedir)/julia
endif
endif
$(INSTALL_F) $(build_includedir)/uv* $(DESTDIR)$(includedir)/julia
endif
$(INSTALL_F) src/julia.h src/julia_version.h src/options.h src/support/*.h $(DESTDIR)$(includedir)/julia
Expand All @@ -295,7 +295,7 @@ endif
# Remove various files which should not be installed
-rm -f $(DESTDIR)$(datarootdir)/julia/base/version_git.sh
-rm -f $(DESTDIR)$(datarootdir)/julia/test/Makefile
# Copy in beautiful new man page
# Copy in beautiful new man page
$(INSTALL_F) $(build_man1dir)/julia.1 $(DESTDIR)$(man1dir)/
# Copy icon and .desktop file
mkdir -p $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ Building Julia requires that the following software be installed:

Julia uses the following external libraries, which are automatically downloaded (or in a few cases, included in the Julia source repository) and then compiled from source the first time you run `make`:

- **[LLVM]** (3.3) — compiler infrastructure. (3.4 not supported; 3.5+ mostly supported, [with caveats](https://github.com/JuliaLang/julia/issues/9336))
- **[LLVM]** (3.3) — compiler infrastructure. (3.4 not supported; 3.5+ mostly supported, [with caveats](https://github.com/JuliaLang/julia/issues/9336))
- **[FemtoLisp]** — packaged with Julia source, and used to implement the compiler front-end.
- **[libuv]** — portable, high-performance event-based I/O library
- **[OpenLibm]** — portable libm library containing elementary math functions.
Expand Down
6 changes: 3 additions & 3 deletions README.windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ Julia uses binary-mode files exclusively. Unlike many other Windows programs, if

git config --global core.eol lf
git config --global core.autocrlf input

or edit `%USERPROFILE%\.gitconfig` and add/edit the lines:

[core] eol = lf
autocrlf = input

Expand Down Expand Up @@ -289,7 +289,7 @@ If you are building for 64-bit windows, the steps are essentially the same. Just

### Build process is slow/eats memory/hangs my computer

- Disable the Windows [Superfetch](http:https://en.wikipedia.org/wiki/Windows_Vista_I/O_technologies#SuperFetch) and
- Disable the Windows [Superfetch](http:https://en.wikipedia.org/wiki/Windows_Vista_I/O_technologies#SuperFetch) and
[Program Compatibility Assistant](http:https://blogs.msdn.com/b/cjacks/archive/2011/11/22/managing-the-windows-7-program-compatibility-assistant-pca.aspx) services, as they are known to have
[spurious interactions]((https://cygwin.com/ml/cygwin/2011-12/msg00058.html)) with MinGW/Cygwin.

Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ branches:

skip_commits:
# Add [av skip] to commit messages for docfixes, etc to reduce load on queue
message: /\[av skip\]/
message: /\[av skip\]/

notifications:
- provider: Email
Expand Down
17 changes: 7 additions & 10 deletions contrib/check-whitespace.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,15 @@ file_patterns='
*.jl
*.lsp
*.scm
*.inc
*.make
*.md
*.rst
*.sh
*.yml
*Makefile
'

# These patterns are disabled until the respective source files are
# corrected:
# *.inc
# *.make
# *.md
# *.rst
# *.sh
# *.yml
# *Makefile

# TODO: Look also for trailing empty lines, and missing '\n' after the
# last line
if git --no-pager grep --color -n --full-name -e ' $' -- $file_patterns; then
Expand Down
2 changes: 1 addition & 1 deletion contrib/mac/app/run-install-name-tool-change.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ elif [ "x$ACTION" == "xid" ]; then
lib="`otool -D $LIBRARY 2>/dev/null | grep ^$WRONG_PREFIX`"
install_name_tool -id "$RIGHT_PREFIX/$lib" $LIBRARY;
fi

2 changes: 1 addition & 1 deletion contrib/mac/mac-gtk.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#/bin/sh

# This script will attempt to download and build GTK+-3,
# This script will attempt to download and build GTK+-3,
# including dependencies, in ~/gtk (also puts stuff in
# ~/.local, ~/Source, ~/.jhbuildrc*)
# While this should work, it may be preferable to execute
Expand Down
4 changes: 2 additions & 2 deletions contrib/repackage_system_suitesparse4.make
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/make -f
#!/usr/bin/make -f

JULIAHOME = $(abspath ..)
include $(JULIAHOME)/Make.inc
Expand Down Expand Up @@ -35,4 +35,4 @@ default:
$(INSTALL_NAME_CMD)libumfpack.$(SHLIB_EXT) $(build_libdir)/libumfpack.$(SHLIB_EXT)
$(CXX) -shared $(WHOLE_ARCHIVE) $(SS_LIB)/libsuitesparseconfig.a $(SS_LIB)/libspqr.a $(NO_WHOLE_ARCHIVE) -o $(build_libdir)/libspqr.$(SHLIB_EXT) $(LDFLAGS) $(LIBBLAS) -L$(build_libdir) -lcolamd -lccolamd -lcamd -lamd -lcholmod $(RPATH_ORIGIN)
$(INSTALL_NAME_CMD)libspqr.$(SHLIB_EXT) $(build_libdir)/libspqr.$(SHLIB_EXT)

2 changes: 1 addition & 1 deletion doc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ File layout
conf.py Sphinx configuration
helpdb.jl REPL help database
stdlib/ Julia standard library documentation
UNDOCUMENTED.rst Undocumented functions (to be filled in and copied to
UNDOCUMENTED.rst Undocumented functions (to be filled in and copied to
the correct location in stdlib/)

Sphinx extensions and theme
Expand Down
2 changes: 1 addition & 1 deletion doc/devdocs/debuggingtips.rst
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Another useful frame is ``to_function(jl_lambda_info_t *li, bool cstyle)``. The
#2 0x00007ffff7928bf7 in to_function (li=0x2812060, cstyle=false) at codegen.cpp:584
584 abort();
(gdb) p jl_(jl_uncompress_ast(li,li.ast))

Inserting breakpoints upon certain conditions
---------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion doc/devdocs/llvm.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Overview of Julia to LLVM Interface
Julia statically links in LLVM by default.
Build with ``USE_LLVM_SHLIB=1`` to link dynamically.

The code for lowering Julia AST to LLVM IR or interpreting it directly is in
The code for lowering Julia AST to LLVM IR or interpreting it directly is in
directory ``src/``.

+---------------------+-------------------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion doc/devdocs/meta.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ the implementation of the ``@inline`` macro::
macro inline(ex)
esc(_inline(ex))
end

_inline(ex::Expr) = pushmeta!(ex, :inline)
_inline(arg) = arg

Expand Down
2 changes: 1 addition & 1 deletion doc/devdocs/sysimg.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Julia now ships with a script that automates the tasks of building the system im
This will include a ``build_sysimg()`` function:

.. function:: build_sysimg(sysimg_path=default_sysimg_path, cpu_target="native", userimg_path=nothing; force=false)

Rebuild the system image. Store it in ``sysimg_path``, which defaults to a file named ``sys.ji`` that sits in the same folder as ``libjulia.{so,dylib}``, except on Windows where it defaults to ``JULIA_HOME/../lib/julia/sys.ji``.
Use the cpu instruction set given by ``cpu_target``. Valid CPU targets are the same as for the ``-C`` option to ``julia``, or the ``-march`` option to ``gcc``. Defaults to ``native``, which means to use all CPU instructions available on the current processor.
Include the user image file given by ``userimg_path``, which should contain directives such as ``using MyPackage`` to include that package in the new system image.
Expand Down
20 changes: 10 additions & 10 deletions doc/manual/calling-c-and-fortran-code.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.. _man-calling-c-and-fortran-code:

****************************
Calling C and Fortran Code
Calling C and Fortran Code
****************************

Though most code can be written in Julia, there are many high-quality,
Expand All @@ -26,7 +26,7 @@ possible to perform whole-program optimizations that can even optimize
across this boundary, but Julia does not yet support that. In the
future, however, it may do so, yielding even greater performance gains.)

Shared libraries and functions are referenced by a tuple of the
Shared libraries and functions are referenced by a tuple of the
form ``(:function, "library")`` or ``("function", "library")`` where ``function``
is the C-exported function name. ``library`` refers to the shared library
name: shared libraries available in the (platform-specific) load path
Expand Down Expand Up @@ -304,7 +304,7 @@ A C function declared to return ``void`` will give ``nothing`` in Julia.

For string arguments (``char*``) the Julia type should be ``Ptr{UInt8}``,
not ``ASCIIString``. C functions that take an argument of the type ``char**``
can be called by using a ``Ptr{Ptr{UInt8}}`` type within Julia. For example,
can be called by using a ``Ptr{Ptr{UInt8}}`` type within Julia. For example,
C functions of the form::

int main(int argc, char **argv);
Expand Down Expand Up @@ -394,7 +394,7 @@ the ccall. ccall automatically arranges that all of its arguments will be
preserved from garbage collection until the call returns. If a C API will
store a reference to memory allocated by Julia, after the ccall returns, you
must arrange that the object remains visible to the garbage collector. The
suggested way to handle this is to make a global variable of type
suggested way to handle this is to make a global variable of type
``Array{Any,1}`` to hold these values, until C interface notifies you that
it is finished with them.

Expand All @@ -405,10 +405,10 @@ of the buffer, so that it is safe to free (or alter) the original data without
affecting Julia. A notable exception is ``pointer_to_array()`` which, for performance
reasons, shares (or can be told to take ownership of) the underlying buffer.

The garbage collector does not guarantee any order of finalization. That is, if ``a``
contained a reference to ``b`` and both ``a`` and ``b`` are due for garbage
The garbage collector does not guarantee any order of finalization. That is, if ``a``
contained a reference to ``b`` and both ``a`` and ``b`` are due for garbage
collection, there is no guarantee that ``b`` would be finalized after ``a``. If
proper finalization of ``a`` depends on ``b`` being valid, it must be handled in
proper finalization of ``a`` depends on ``b`` being valid, it must be handled in
other ways.


Expand Down Expand Up @@ -443,7 +443,7 @@ Calling Convention

The second argument to ``ccall`` can optionally be a calling convention
specifier (immediately preceding return type). Without any specifier,
the platform-default C calling convention is used. Other supported
the platform-default C calling convention is used. Other supported
conventions are: ``stdcall``, ``cdecl``, ``fastcall``, and ``thiscall``.
For example (from base/libc.jl)::

Expand Down Expand Up @@ -543,7 +543,7 @@ For more details on how to pass callbacks to C libraries, see this
C++
---

Limited support for C++ is provided by the `Cpp <https://github.com/timholy/Cpp.jl>`_
Limited support for C++ is provided by the `Cpp <https://github.com/timholy/Cpp.jl>`_
and `Clang <https://github.com/ihnorton/Clang.jl>`_ packages.

Handling Platform Variations
Expand All @@ -552,7 +552,7 @@ Handling Platform Variations
When dealing with platform libraries, it is often necessary to provide special cases
for various platforms. The variable ``OS_NAME`` can be used to write these special
cases. Additionally, there are several macros intended to make this easier:
``@windows``, ``@unix``, ``@linux``, and ``@osx``. Note that linux and osx are mutually
``@windows``, ``@unix``, ``@linux``, and ``@osx``. Note that linux and osx are mutually
exclusive subsets of unix. Their usage takes the form of a ternary conditional
operator, as demonstrated in the following examples.

Expand Down
4 changes: 2 additions & 2 deletions doc/manual/complex-and-rational-numbers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.. currentmodule:: Base

******************************
Complex and Rational Numbers
Complex and Rational Numbers
******************************

Julia ships with predefined types representing both complex and rational
Expand Down Expand Up @@ -185,7 +185,7 @@ construct a complex value directly from its real and imaginary parts.:
This construction avoids the multiplication and addition operations.

:const:`Inf` and :const:`NaN` propagate through complex numbers in the real
and imaginary parts of a complex number as described in the
and imaginary parts of a complex number as described in the
:ref:`man-special-floats` section:

.. doctest::
Expand Down
2 changes: 1 addition & 1 deletion doc/manual/constructors.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.. currentmodule:: Base

**************
Constructors
Constructors
**************

Constructors [#]_ are functions that create new objects — specifically,
Expand Down
Loading

0 comments on commit 6cd421c

Please sign in to comment.