commit b87873222a509f5c6ba07e9d7c78d7b20909f805
author Sergey Yelin <elinsn@gmail.com> Tue Mar 23 23:48:02 2021 +0300
committer Jens Geyer <jensg@apache.org> Wed Mar 24 22:34:12 2021 +0100
tree 91388c53508286acb87abb49ff010183ac27887a
parent 149c8d09b11328c0cd6da79fd9267520b800fefc

Remove Erlang R16 support
Client: erl
Patch: Sergey Yelin

This closes #2354

compiler/cpp/src/thrift/generate/t_erl_generator.cc

diff --git a/compiler/cpp/src/thrift/generate/t_erl_generator.cc b/compiler/cpp/src/thrift/generate/t_erl_generator.cc
index c96c1b2..3d4776c 100644
--- a/compiler/cpp/src/thrift/generate/t_erl_generator.cc
+++ b/compiler/cpp/src/thrift/generate/t_erl_generator.cc
@@ -56,7 +56,6 @@
 
     legacy_names_ = false;
     maps_ = false;
-    otp16_ = false;
     export_lines_first_ = true;
     export_types_lines_first_ = true;
 
@@ -65,17 +64,11 @@
         legacy_names_ = true;
       } else if( iter->first.compare("maps") == 0) {
         maps_ = true;
-      } else if( iter->first.compare("otp16") == 0) {
-        otp16_ = true;
       } else {
         throw "unknown option erl:" + iter->first;
       }
     }
 
-    if (maps_ && otp16_) {
-      throw "argument error: Cannot specify both maps and otp16; maps are not available for Erlang/OTP R16 or older";
-    }
-
     out_dir_base_ = "gen-erl";
   }
 
@@ -184,9 +177,6 @@
   /* if true use maps instead of dicts in generated code */
   bool maps_;
 
-  /* if true use non-namespaced dict and set instead of dict:dict and sets:set */
-  bool otp16_;
-
   /**
    * add function to export list
    */
@@ -748,17 +738,11 @@
   } else if (type->is_map()) {
     if (maps_) {
       return "map()";
-    } else if (otp16_) {
-      return "dict()";
     } else {
       return "dict:dict()";
     }
   } else if (type->is_set()) {
-    if (otp16_) {
-      return "set()";
-    } else {
       return "sets:set()";
-    }
   } else if (type->is_list()) {
     return "list()";
   } else {

lib/erl/Makefile.am

diff --git a/lib/erl/Makefile.am b/lib/erl/Makefile.am
index d4544a3..bf7abd5 100644
--- a/lib/erl/Makefile.am
+++ b/lib/erl/Makefile.am
@@ -26,16 +26,9 @@
 		  ../../test/DoubleConstantsTest.thrift \
 		  ../../test/ThriftTest.thrift
 
-if ERLANG_OTP16
-ERL_FLAG = erl:otp16
-ERL_FLAG_LEGACY = erl:otp16,legacynames
-# otp16 + maps does not make sense. We need to generate it anyway to avoid include error.
-ERL_FLAG_MAPS = erl:otp16
-else
 ERL_FLAG = erl
 ERL_FLAG_LEGACY = erl:legacynames
 ERL_FLAG_MAPS = erl:maps
-endif
 
 $(THRIFT_OMIT_FILE): test/Thrift_omit_with.thrift
 	grep -v omit $< >$@

lib/erl/rebar.config

diff --git a/lib/erl/rebar.config b/lib/erl/rebar.config
index ab2c255..b5258a2 100644
--- a/lib/erl/rebar.config
+++ b/lib/erl/rebar.config
@@ -1,4 +1,4 @@
-{erl_opts, [{platform_define, "^R.*", otp16_or_less}, debug_info]}.
+{erl_opts, [debug_info]}.
 
 {profiles, [
     {test, [

lib/erl/test/test_thrift_3214.erl

diff --git a/lib/erl/test/test_thrift_3214.erl b/lib/erl/test/test_thrift_3214.erl
index 0f9544b..118e779 100644
--- a/lib/erl/test/test_thrift_3214.erl
+++ b/lib/erl/test/test_thrift_3214.erl
@@ -23,7 +23,6 @@
 -include("gen-erl/thrift3214_types.hrl").
 
 -ifdef(TEST).
--ifndef(otp16_or_less).
 -include_lib("eunit/include/eunit.hrl").
 
 record_generation_test_() ->
@@ -57,4 +56,3 @@
   ].
 
 -endif.
--endif.