Merge pull request #175 from pragdave/spdx

added SPDX information

Author: RobertDober

LICENSE

@@ -4,10 +4,15 @@ Copyright © 2014 Dave Thomas, The Pragmatic Programmers
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      https://spdx.org/licenses/Apache-2.0.html
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+
+Note:
+Individual files contain the following tag instead of the full license text.
+
+        SPDX-License-Identifier: Apache-2.0

README.md

@@ -402,3 +402,5 @@ Copyright © 2014 Dave Thomas, The Pragmatic Programmers
 # LICENSE
 
 Same as Elixir, which is Apache License v2.0. Please refer to [LICENSE](LICENSE) for details.
+
+SPDX-License-Identifier: Apache-2.0

lib/earmark.ex

@@ -372,3 +372,5 @@ defmodule Earmark do
     |> Enum.map(&Task.await/1)
   end
 end
+
+# SPDX-License-Identifier: Apache-2.0

lib/earmark/block.ex

@@ -580,3 +580,5 @@ defmodule Earmark.Block do
     |> Enum.reverse
   end
 end
+
+# SPDX-License-Identifier: Apache-2.0

lib/earmark/cli.ex

@@ -93,3 +93,5 @@ defmodule Earmark.CLI do
   end
 
 end
+
+# SPDX-License-Identifier: Apache-2.0

lib/earmark/context.ex

@@ -147,3 +147,5 @@ defmodule Earmark.Context do
     end
 
 end
+
+# SPDX-License-Identifier: Apache-2.0

lib/earmark/error.ex

@@ -8,3 +8,5 @@ defmodule Earmark.Error do
   def exception(msg), do: %__MODULE__{message: msg}
 
 end
+
+# SPDX-License-Identifier: Apache-2.0

lib/earmark/helpers.ex

@@ -63,3 +63,5 @@ defmodule Earmark.Helpers do
 
 
 end
+
+# SPDX-License-Identifier: Apache-2.0

lib/earmark/helpers/attr_parser.ex

@@ -57,3 +57,5 @@ defmodule Earmark.Helpers.AttrParser do
   defp add_errors(context, errors, lnb), do: add_message(context, {:warning, lnb, "Illegal attributes #{inspect errors} ignored in IAL"})
 
 end
+
+# SPDX-License-Identifier: Apache-2.0

lib/earmark/helpers/html_helpers.ex

@@ -56,3 +56,5 @@ defmodule Earmark.Helpers.HtmlHelpers do
   end
 
 end
+
+# SPDX-License-Identifier: Apache-2.0

lib/earmark/helpers/leex_helpers.ex

@@ -25,3 +25,5 @@ defmodule Earmark.Helpers.LeexHelpers do
   defp elixirize_tokens([{token, _, text}|rest], result), do: elixirize_tokens(rest, [{token,to_string(text)}|result])
 
 end
+
+# SPDX-License-Identifier: Apache-2.0

lib/earmark/helpers/line_helpers.ex

@@ -37,3 +37,5 @@ defmodule Earmark.Helpers.LineHelpers do
   def blank_line_in?([ _ | rest ]),          do: blank_line_in?(rest)
 
 end
+
+# SPDX-License-Identifier: Apache-2.0

lib/earmark/helpers/link_parser.ex

@@ -107,3 +107,5 @@ defmodule Earmark.Helpers.LinkParser do
 
   defp list_to_text(lst), do: lst |> Enum.reverse() |> Enum.join("")
 end
+
+# SPDX-License-Identifier: Apache-2.0

lib/earmark/helpers/lookahead_helpers.ex

@@ -171,3 +171,5 @@ defmodule Earmark.Helpers.LookaheadHelpers do
       %{ params | pending: pending, pending_lnb: pending_lnb }
   end
 end
+
+# SPDX-License-Identifier: Apache-2.0

lib/earmark/helpers/reparse_helpers.ex

@@ -51,3 +51,5 @@ defmodule Earmark.Helpers.ReparseHelpers do
     line.content
   end
 end
+
+# SPDX-License-Identifier: Apache-2.0

lib/earmark/helpers/string_helpers.ex

@@ -22,3 +22,5 @@ defmodule Earmark.Helpers.StringHelpers do
     {lead, behead(str, lead)}
   end
 end
+
+# SPDX-License-Identifier: Apache-2.0

lib/earmark/helpers/yecc_helpers.ex

@@ -14,3 +14,5 @@ defmodule Earmark.Helpers.YeccHelpers do
     end
   end
 end
+
+# SPDX-License-Identifier: Apache-2.0

lib/earmark/html_renderer.ex

@@ -260,3 +260,5 @@ defmodule Earmark.HtmlRenderer do
   end
 
 end
+
+# SPDX-License-Identifier: Apache-2.0

lib/earmark/inline.ex

@@ -315,3 +315,5 @@
     { rest, context, result, lnb + String.length(suffix) }
   end
 end
+
+# SPDX-License-Identifier: Apache-2.0

lib/earmark/line.ex

@@ -249,3 +249,5 @@ defmodule Earmark.Line do
   end
 
 end
+
+# SPDX-License-Identifier: Apache-2.0

lib/earmark/message.ex

@@ -60,3 +60,5 @@ defmodule Earmark.Message do
   end
 
 end
+
+# SPDX-License-Identifier: Apache-2.0

lib/earmark/options.ex

@@ -36,3 +36,5 @@ defmodule Earmark.Options do
   end
 
 end
+
+# SPDX-License-Identifier: Apache-2.0

lib/earmark/parser.ex

@@ -79,3 +79,5 @@ defmodule Earmark.Parser do
   end
 
 end
+
+# SPDX-License-Identifier: Apache-2.0

lib/earmark/plugin.ex

@@ -135,3 +135,5 @@ defmodule Earmark.Plugin do
   end
   def define(options, plugin), do: define(options, {plugin, ""})
 end
+
+# SPDX-License-Identifier: Apache-2.0

lib/earmark/scanner.ex

@@ -151,3 +151,5 @@ defmodule Earmark.Scanner do
     end
   end
 end
+
+# SPDX-License-Identifier: Apache-2.0

lib/earmark/types.ex

@@ -13,3 +13,5 @@ defmodule Earmark.Types do
   end
 
 end
+
+# SPDX-License-Identifier: Apache-2.0

mix.exs

@@ -75,3 +75,5 @@ defmodule Earmark.Mixfile do
     Mix.Tasks.Readme.run(args)
   end
 end
+
+# SPDX-License-Identifier: Apache-2.0

src/link_text_lexer.erl

@@ -1,4 +1,4 @@
--file("/usr/local/Cellar/erlang/19.0.2/lib/erlang/lib/parsetools-2.1.2/include/leexinc.hrl", 0).
+-file("/usr/local/Cellar/erlang/20.1.5/lib/erlang/lib/parsetools-2.1.5/include/leexinc.hrl", 0).
 %% The source of this file is part of leex distribution, as such it
 %% has the same Copyright as the other files in the leex
 %% distribution. The Copyright is defined in the accompanying file
@@ -16,7 +16,7 @@
 
 dismiss_backslash([$\\|Chars]) -> Chars.
 
--file("/usr/local/Cellar/erlang/19.0.2/lib/erlang/lib/parsetools-2.1.2/include/leexinc.hrl", 14).
+-file("/usr/local/Cellar/erlang/20.1.5/lib/erlang/lib/parsetools-2.1.5/include/leexinc.hrl", 14).
 
 format_error({illegal,S}) -> ["illegal characters ",io_lib:write_string(S)];
 format_error({user,S}) -> S.
@@ -37,12 +37,14 @@ string(Ics0, L0, Tcs, Ts) ->
     case yystate(yystate(), Ics0, L0, 0, reject, 0) of
         {A,Alen,Ics1,L1} ->                  % Accepting end state
             string_cont(Ics1, L1, yyaction(A, Alen, Tcs, L0), Ts);
-        {A,Alen,Ics1,L1,_S1} ->              % Accepting transition state
+        {A,Alen,Ics1,L1,_S1} ->              % Accepting transistion state
             string_cont(Ics1, L1, yyaction(A, Alen, Tcs, L0), Ts);
         {reject,_Alen,Tlen,_Ics1,L1,_S1} ->  % After a non-accepting state
             {error,{L0,?MODULE,{illegal,yypre(Tcs, Tlen+1)}},L1};
-        {A,Alen,_Tlen,_Ics1,_L1,_S1} ->
-            string_cont(yysuf(Tcs, Alen), L0, yyaction(A, Alen, Tcs, L0), Ts)
+        {A,Alen,Tlen,_Ics1,L1,_S1} ->
+            Tcs1 = yysuf(Tcs, Alen),
+            L2 = adjust_line(Tlen, Alen, Tcs1, L1),
+            string_cont(Tcs1, L2, yyaction(A, Alen, Tcs, L0), Ts)
     end.
 
 %% string_cont(RestChars, Line, Token, Tokens)
@@ -112,8 +114,10 @@ token(S0, Ics0, L0, Tcs, Tlen0, Tline, A0, Alen0) ->
         {reject,_Alen1,Tlen1,Ics1,L1,_S1} ->    % No token match
             Error = {Tline,?MODULE,{illegal,yypre(Tcs, Tlen1+1)}},
             {done,{error,Error,L1},Ics1};
-        {A1,Alen1,_Tlen1,_Ics1,_L1,_S1} ->       % Use last accept match
-            token_cont(yysuf(Tcs, Alen1), L0, yyaction(A1, Alen1, Tcs, Tline))
+        {A1,Alen1,Tlen1,_Ics1,L1,_S1} ->       % Use last accept match
+            Tcs1 = yysuf(Tcs, Alen1),
+            L2 = adjust_line(Tlen1, Alen1, Tcs1, L1),
+            token_cont(Tcs1, L2, yyaction(A1, Alen1, Tcs, Tline))
     end.
 
 %% token_cont(RestChars, Line, Token)
@@ -186,9 +190,11 @@ tokens(S0, Ics0, L0, Tcs, Tlen0, Tline, Ts, A0, Alen0) ->
             %% Skip rest of tokens.
             Error = {L1,?MODULE,{illegal,yypre(Tcs, Tlen1+1)}},
             skip_tokens(yysuf(Tcs, Tlen1+1), L1, Error);
-        {A1,Alen1,_Tlen1,_Ics1,_L1,_S1} ->
+        {A1,Alen1,Tlen1,_Ics1,L1,_S1} ->
             Token = yyaction(A1, Alen1, Tcs, Tline),
-            tokens_cont(yysuf(Tcs, Alen1), L0, Token, Ts)
+            Tcs1 = yysuf(Tcs, Alen1),
+            L2 = adjust_line(Tlen1, Alen1, Tcs1, L1),
+            tokens_cont(Tcs1, L2, Token, Ts)
     end.
 
 %% tokens_cont(RestChars, Line, Token, Tokens)
@@ -240,9 +246,11 @@ skip_tokens(S0, Ics0, L0, Tcs, Tlen0, Tline, Error, A0, Alen0) ->
             {done,{error,Error,L1},eof};
         {reject,_Alen1,Tlen1,_Ics1,L1,_S1} ->
             skip_tokens(yysuf(Tcs, Tlen1+1), L1, Error);
-        {A1,Alen1,_Tlen1,_Ics1,L1,_S1} ->
+        {A1,Alen1,Tlen1,_Ics1,L1,_S1} ->
             Token = yyaction(A1, Alen1, Tcs, Tline),
-            skip_cont(yysuf(Tcs, Alen1), L1, Token, Error)
+            Tcs1 = yysuf(Tcs, Alen1),
+            L2 = adjust_line(Tlen1, Alen1, Tcs1, L1),
+            skip_cont(Tcs1, L2, Token, Error)
     end.
 
 %% skip_cont(RestChars, Line, Token, Error)
@@ -274,6 +282,17 @@ yyrev(List, Tail) -> lists:reverse(List, Tail).
 yypre(List, N) -> lists:sublist(List, N).
 yysuf(List, N) -> lists:nthtail(N, List).
 
+%% adjust_line(TokenLength, AcceptLength, Chars, Line) -> NewLine
+%% Make sure that newlines in Chars are not counted twice.
+%% Line has been updated with respect to newlines in the prefix of
+%% Chars consisting of (TokenLength - AcceptLength) characters.
+
+adjust_line(N, N, _Cs, L) -> L;
+adjust_line(T, A, [$\n|Cs], L) ->
+    adjust_line(T-1, A, Cs, L-1);
+adjust_line(T, A, [_|Cs], L) ->
+    adjust_line(T-1, A, Cs, L).
+
 %% yystate() -> InitialState.
 %% yystate(State, InChars, Line, CurrTokLen, AcceptAction, AcceptLen) ->
 %% {Action, AcceptLen, RestChars, Line} |
@@ -284,7 +303,7 @@ yysuf(List, N) -> lists:nthtail(N, List).
 %% return signal either an unrecognised character or end of current
 %% input.
 
--file("src/link_text_lexer.erl", 286).
+-file("src/link_text_lexer.erl", 305).
 yystate() -> 10.
 
 yystate(11, [33|Ics], Line, Tlen, _, _) ->
@@ -476,4 +495,4 @@ yyaction_9(TokenChars, TokenLine) ->
 yyaction_10(TokenChars, TokenLine) ->
      { token, { verbatim, TokenLine, TokenChars } } .
 
--file("/usr/local/Cellar/erlang/19.0.2/lib/erlang/lib/parsetools-2.1.2/include/leexinc.hrl", 290).
+-file("/usr/local/Cellar/erlang/20.1.5/lib/erlang/lib/parsetools-2.1.5/include/leexinc.hrl", 309).

src/link_text_parser.erl

@@ -14,11 +14,13 @@ make_image_tuple({L, R}) -> {L, string:concat("!", R)}.
 
 title_tuple({Title, Parsed}) -> {Title, string:join(["[", Parsed, "]"], "")}.
 
--file("/home/robert/.asdf/installs/erlang/19.1/lib/erlang/lib/parsetools-2.1.3/include/yeccpre.hrl", 0).
+%% SPDX-License-Identifier: Apache-2.0
+
+-file("/usr/local/Cellar/erlang/20.1.5/lib/erlang/lib/parsetools-2.1.5/include/yeccpre.hrl", 0).
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -168,27 +170,26 @@ yecctoken_location(Token) ->
     end.
 
 -compile({nowarn_unused_function, yecctoken2string/1}).
-yecctoken2string({atom, _, A}) -> io_lib:write(A);
+yecctoken2string({atom, _, A}) -> io_lib:write_atom(A);
 yecctoken2string({integer,_,N}) -> io_lib:write(N);
 yecctoken2string({float,_,F}) -> io_lib:write(F);
 yecctoken2string({char,_,C}) -> io_lib:write_char(C);
 yecctoken2string({var,_,V}) -> io_lib:format("~s", [V]);
 yecctoken2string({string,_,S}) -> io_lib:write_string(S);
 yecctoken2string({reserved_symbol, _, A}) -> io_lib:write(A);
-yecctoken2string({_Cat, _, Val}) -> io_lib:format("~p",[Val]);
+yecctoken2string({_Cat, _, Val}) -> io_lib:format("~tp", [Val]);
 yecctoken2string({dot, _}) -> "'.'";
-yecctoken2string({'$end', _}) ->
-    [];
+yecctoken2string({'$end', _}) -> [];
 yecctoken2string({Other, _}) when is_atom(Other) ->
-    io_lib:write(Other);
+    io_lib:write_atom(Other);
 yecctoken2string(Other) ->
-    io_lib:write(Other).
+    io_lib:format("~tp", [Other]).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
 
--file("src/link_text_parser.erl", 191).
+-file("src/link_text_parser.erl", 192).
 
 -dialyzer({nowarn_function, yeccpars2/7}).
 yeccpars2(0=S, Cat, Ss, Stack, T, Ts, Tzr) ->
@@ -766,4 +767,4 @@ yeccpars2_34_(__Stack0) ->
   end | __Stack].
 
 
--file("src/link_text_parser.yrl", 56).
+-file("src/link_text_parser.yrl", 58).

src/link_text_parser.yrl

@@ -53,3 +53,5 @@ extract_token({_Token, _Line, Value}) -> {Value, Value}.
 make_image_tuple({L, R}) -> {L, string:concat("!", R)}.
 
 title_tuple({Title, Parsed}) -> {Title, string:join(["[", Parsed, "]"], "")}.
+
+%% SPDX-License-Identifier: Apache-2.0

tasks/docs.exs

@@ -35,3 +35,4 @@ defmodule Mix.Tasks.Docs do
 end
 
 
+# SPDX-License-Identifier: Apache-2.0

tasks/readme.exs

@@ -105,3 +105,4 @@ defmodule Mix.Tasks.Readme do
 end
 
 
+# SPDX-License-Identifier: Apache-2.0

test/acceptance/atx_headers_test.exs

@@ -77,3 +77,5 @@ defmodule Acceptance.AtxHeadersTest do
 
   # end
 end
+
+# SPDX-License-Identifier: Apache-2.0

test/acceptance/block_ial_test.exs

@@ -71,3 +71,5 @@ defmodule Acceptance.BlockIalTest do
 
   end
 end
+
+# SPDX-License-Identifier: Apache-2.0

test/acceptance/block_quotes_test.exs

@@ -36,3 +36,5 @@ defmodule Acceptance.BlockQuotesTest do
 
   # end
 end
+
+# SPDX-License-Identifier: Apache-2.0

test/acceptance/diverse_test.exs

@@ -30,3 +30,5 @@ defmodule Acceptance.DiverseTest do
    end
 
 end
+
+# SPDX-License-Identifier: Apache-2.0

test/acceptance/emphasis_test.exs

@@ -102,3 +102,5 @@ defmodule Acceptance.EmphasisTest do
 
   # end
 end
+
+# SPDX-License-Identifier: Apache-2.0

test/acceptance/escape_test.exs

@@ -55,3 +55,5 @@ defmodule Acceptance.EscapeTest do
     end
   # end
 end
+
+# SPDX-License-Identifier: Apache-2.0

test/acceptance/fenced_code_blocks_test.exs

@@ -46,3 +46,5 @@ defmodule Acceptance.FencedCodeBlocksTest do
 
   # end
 end
+
+# SPDX-License-Identifier: Apache-2.0

test/acceptance/footnotes_test.exs

@@ -43,3 +43,5 @@ defmodule Acceptance.FootnotesTest do
   # end
 
 end
+
+# SPDX-License-Identifier: Apache-2.0