Merge branches 'erlang-27', 'bugfix-json-format-maps-doc' and 'tag-generated'

Author: tomas-abrahamsson

Makefile

@@ -179,6 +179,20 @@ override ERLC_FLAGS += -DNO_HAVE_ERL20_STR_FUNCTIONS=true
 endif
 endif
 
+ifdef NO_HAVE_PLUS_MINUS_ZERO_FLOAT
+override ERLC_FLAGS += -DNO_HAVE_PLUS_MINUS_ZERO_FLOAT=true
+else
+## attempt to auto-detect
+HAVE_PLUS_MINUS_ZERO_FLOAT := $(shell $(ERL) $(ERL_BATCH_FLAGS) -eval ' \
+                             io:format("~p~n", [+0.0 =/= -0.0]), \
+                             receive after 10 -> ok end.' \
+                         -s erlang halt)
+ifeq ($(HAVE_PLUS_MINUS_ZERO_FLOAT),false)
+override ERLC_FLAGS += -DNO_HAVE_PLUS_MINUS_ZERO_FLOAT=true
+endif
+endif
+
+
 
 # Sorting it also eliminates duplicates
 MODULES := \
@@ -270,7 +284,8 @@ clean_plt:
 
 $(plt):
 	dialyzer -q --build_plt --output_plt $@ \
-		--apps erts kernel stdlib syntax_tools compiler crypto eunit
+		--apps erts kernel stdlib syntax_tools compiler \
+			parsetools crypto eunit
 
 
 FORCE:

rebar.config.script

@@ -23,7 +23,21 @@ NoHaveErl20StrFunctions =
                  catch error:undef -> [{d,'NO_HAVE_ERL20_STR_FUNCTIONS'}]
                  end.
 
-ConfigOpts = NoHaveMapsOpts ++ NoHaveRandOpts ++ NoHaveErl20StrFunctions.
+%% In Erlang 27, the expression +0.0 =:= -0.0 will evaluate to false
+%% whereas in Erlang 26 and earlier, it evaluates to true.
+%% In Erlang 26.1, as a prep for Erlang 27, using 0.0 in match expreessions or
+%% in comparisons with =:= or =/= will result in a warning that hints about
+%% rewriting the value to either +0.0 or -0.0.
+%% This preprocessor definition is for we want to run something, eg a unit
+%% test, in Erlang versions that can tell +0.0 and -0.0 apart.
+NoHavePlusMinusZeroFloat =
+                 case +0.0 =:= -0.0 of
+                     true  -> [{d,'NO_HAVE_PLUS_MINUS_ZERO_FLOAT'}];
+                     false -> []
+                 end.
+
+ConfigOpts = NoHaveMapsOpts ++ NoHaveRandOpts ++ NoHaveErl20StrFunctions ++
+                 NoHavePlusMinusZeroFloat.
 
 [{require_otp_vsn, ".*"},
 

src/gpb_compile.erl

@@ -1226,8 +1226,8 @@ file(File) ->
 %%
 %% The `{json_format,Format}' option is a convenience shorthand, and will expand
 %% as indicated below. If the json_format is not specified, it defaults to
-%% `map' if the `maps' option is specified, and otherwise to `eep18' when
-%% generating code for records.
+%% `maps' if the <a href="#option-maps">`maps'</a> option is specified,
+%% and otherwise to `eep18' when generating code for records.
 %% <dl>
 %%   <dt>jsx</dt>
 %%   <dd><code>[{json_object_format, eep18},
@@ -1247,7 +1247,7 @@ file(File) ->
 %%              {json_array_format, list},
 %%              {json_string_format, binary},
 %%              {json_null, null}]</code></dd>
-%%   <dt>map</dt>
+%%   <dt>maps</dt>
 %%   <dd><code>[{json_object_format, map},
 %%              {json_key_format, binary},
 %%              {json_array_format, list},
@@ -2913,8 +2913,8 @@ c() ->
 %%   <dt><a id="cmdline-option-json-format"/>
 %%       `-json-format jsx | mochijson2 | jiffy | maps'</dt>
 %%     <dd>Specify format for the JSON representation.
-%%       `maps' is default if the `-maps' option is specified,
-%%       otherwise the jsx format is default.<br/>
+%%       `maps' is default if the <a href="#cmdline-option-maps">`-maps'</a>
+%%       option is specified, otherwise the jsx format is default.<br/>
 %%       Corresponding Erlang-level option:
 %%       <a href="#option-json_format">json_format</a></dd>
 %%   <dt><a id="cmdline-option-json-object-format"/>
@@ -4392,7 +4392,8 @@ format_erl(Mod, Defs, DefsNoRenamings, DefsForIntrospect,
     DoDecoders = gpb_lib:get_gen_decoders(Opts),
     CompileOptsStr = get_erlc_compile_options_str(Opts),
     gpb_lib:iolist_to_utf8_or_escaped_binary(
-      [?f("%% @private~n"
+      [?f("%% % this file is @generated~n"
+          "%% @private~n"
           "%% Automatically generated, do not edit~n"
           "%% Generated by ~p version ~s~n"
           "%% Version source: ~s~n",

src/gpb_gen_nif.erl

@@ -2480,7 +2480,7 @@ underscore_suffix(A) when is_atom(A) ->
 'is_c++_keyword'(do) -> true;
 'is_c++_keyword'(double) -> true;
 'is_c++_keyword'(dynamic_cast) -> true;
-'is_c++_keyword'(else) -> true;
+'is_c++_keyword'('else') -> true;
 'is_c++_keyword'(enum) -> true;
 'is_c++_keyword'(explicit) -> true;
 'is_c++_keyword'(export) -> true;

test/gpb_compile_tests.erl

@@ -1330,7 +1330,6 @@ calc_byte_copy_lim_aux(N) when N =< 8192 ->
           binary:referenced_byte_size(B),
           byte_size(C)} of
         {_, Sz, Sz} ->
-            ?assertEqual(10, binary:referenced_byte_size(binary:copy(A))),
             {found, {at_least, N1}};
         _X ->
             %% Maybe sub-binaries of larger size don't get copied?
@@ -1461,14 +1460,7 @@ strings_as_binaries_opt_together_with_copy_bytes_opt_test() ->
                         "}"],
                        [strings_as_binaries, {copy_bytes, auto}]),
     Data = M:encode_msg({m1, "some string"}),
-    {m1, <<"some string">>=StrBin} = M:decode_msg(Data, m1),
-    HasBinary = (catch binary:copy(<<1>>)) == <<1>>, % binary exists since R14A
-    if HasBinary ->
-            ?assertEqual(byte_size(StrBin),
-                         binary:referenced_byte_size(StrBin));
-       true ->
-            ok
-    end,
+    {m1, <<"some string">>} = M:decode_msg(Data, m1),
     unload_code(M).
 
 accepts_both_strings_and_binaries_as_input_test() ->

test/gpb_tests.erl

@@ -1138,6 +1138,24 @@ proto3_type_default_values_never_serialized_for_enums_test() ->
     <<>> = encode_msg({m, 0}, Defs), % when given as integer
     {m, e0} = decode_msg(<<>>, m, Defs).
 
+-ifndef(NO_HAVE_PLUS_MINUS_ZERO_FLOAT).
+proto3_type_defaults_values_for_float_test() ->
+    DefsF = [{syntax,"proto3"},
+             {proto3_msgs,[m]},
+             {{msg,m},[#?gpb_field{name=f, fnum=1, rnum=2, type=float,
+                                   occurrence=defaulty, opts=[]}]}],
+    <<>> = encode_msg({m, 0.0}, DefsF),
+    %% -0.0 as a float or double: the signbit is 1, the rest of the bits are 0,
+    %% and it is little-endian.
+    <<13, 0,0,0,128>> = encode_msg({m, -0.0}, DefsF),
+    DefsD = [{syntax,"proto3"},
+             {proto3_msgs,[m]},
+             {{msg,m},[#?gpb_field{name=f, fnum=1, rnum=2, type=double,
+                                   occurrence=defaulty, opts=[]}]}],
+    <<>> = encode_msg({m, 0.0}, DefsD),
+    <<9, 0,0,0,0, 0,0,0,128>> = encode_msg({m, -0.0}, DefsD).
+-endif. % NO_HAVE_PLUS_MINUS_ZERO_FLOAT
+
 proto3_optional_test() ->
     Defs = [{proto_defs_version,2},
             {syntax,"proto3"},