~clint-fewbar/ubuntu/precise/erlang/merge-15b

« back to all changes in this revision

Viewing changes to lib/syntax_tools/src/erl_syntax.erl

  • Committer: Package Import Robot
  • Author(s): Sergei Golovan
  • Date: 2011-12-15 19:20:10 UTC
  • mfrom: (1.1.18) (3.5.15 sid)
  • mto: (3.5.16 sid)
  • mto: This revision was merged to the branch mainline in revision 33.
  • Revision ID: package-import@ubuntu.com-20111215192010-jnxcfe3tbrpp0big
Tags: 1:15.b-dfsg-1
* New upstream release.
* Upload to experimental because this release breaks external drivers
  API along with ABI, so several applications are to be fixed.
* Removed SSL patch because the old SSL implementation is removed from
  the upstream distribution.
* Removed never used patch which added native code to erlang beam files.
* Removed the erlang-docbuilder binary package because the docbuilder
  application was dropped by upstream.
* Documented dropping ${erlang-docbuilder:Depends} substvar in
  erlang-depends(1) manpage.
* Made erlang-base and erlang-base-hipe provide virtual package
  erlang-abi-15.b (the number means the first erlang version, which
  provides current ABI).

Show diffs side-by-side

added added

removed removed

Lines of Context:
6093
6093
        {'fun', Pos, {function, Atom, Arity}} ->
6094
6094
            arity_qualifier(set_pos(atom(Atom), Pos),
6095
6095
                            set_pos(integer(Arity), Pos));
6096
 
        {'fun', Pos, {function, Module, Atom, Arity}} ->
 
6096
        {'fun', Pos, {function, Module, Atom, Arity}}
 
6097
          when is_atom(Module), is_atom(Atom), is_integer(Arity) ->
 
6098
            %% Backward compatibility with pre-R15 abstract format.
6097
6099
            module_qualifier(set_pos(atom(Module), Pos),
6098
6100
                             arity_qualifier(
6099
6101
                               set_pos(atom(Atom), Pos),
6100
6102
                               set_pos(integer(Arity), Pos)));
 
6103
        {'fun', Pos, {function, Module, Atom, Arity}} ->
 
6104
            %% New in R15: fun M:F/A.
 
6105
            module_qualifier(Module, arity_qualifier(Atom, Arity));
6101
6106
        Node1 ->
6102
6107
            data(Node1)
6103
6108
    end.