diff options
| author | Hans Bolinder <[email protected]> | 2017-03-14 14:15:47 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2017-03-14 14:15:47 +0100 |
| commit | dcba34b6295edca4cc9c899152612f410d23c1ef (patch) | |
| tree | 37d87f0b5189d6056c94d49ce395e96795c986b1 /lib/stdlib/src/c.erl | |
| parent | 318e9dfbba306e7b18f2e74d6f468c81e1ac1f57 (diff) | |
| parent | 568706c4c4b8261e7a63e20be9a355ebe5d6562e (diff) | |
| download | otp-dcba34b6295edca4cc9c899152612f410d23c1ef.tar.gz otp-dcba34b6295edca4cc9c899152612f410d23c1ef.tar.bz2 otp-dcba34b6295edca4cc9c899152612f410d23c1ef.zip | |
Merge branch 'hasse/fix_erl_anno_use'
* hasse/fix_erl_anno_use:
parsetools: Fix handling of locations and annotations
diameter: Fix handling of locations and annotations
kernel: Fix handling of locations and annotations
compiler: Fix handling of locations and annotations
eunit: Fix handling of locations and annotations
Update preloaded
erts: Fix handling of locations and annotations
dialyzer: Fix handling of annotations in a test
debugger: Fix handling of locations and annotations
stdlib: Extend functions in erl_parse to handle form_info()
stdlib: Fix handling of locations and annotations
erts: Correct the documentation of abstract end-of-file
stdlib: Add debug tests to the erl_parse module
stdlib: improve the erl_anno module's debug tests
stdlib: Improve the erl_pp module's debug tests
Diffstat (limited to 'lib/stdlib/src/c.erl')
| -rw-r--r-- | lib/stdlib/src/c.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/stdlib/src/c.erl b/lib/stdlib/src/c.erl index 52df2319dd..bb7b485490 100644 --- a/lib/stdlib/src/c.erl +++ b/lib/stdlib/src/c.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2016. 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. @@ -400,7 +400,7 @@ split_def([], Res) -> {d, list_to_atom(reverse(Res))}. make_term(Str) -> case erl_scan:string(Str) of {ok, Tokens, _} -> - case erl_parse:parse_term(Tokens ++ [{dot, 1}]) of + case erl_parse:parse_term(Tokens ++ [{dot, erl_anno:new(1)}]) of {ok, Term} -> Term; {error, {_,_,Reason}} -> io:format("~ts: ~ts~n", [Reason, Str]), |