From e073ffc39c29dcec5dec0a0af070952e03c1fa8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Fri, 6 Mar 2015 14:53:32 +0100
Subject: asn1ct_gen: Correct generation of .hrl files for multiple ellipses

---
 lib/asn1/src/asn1ct_gen.erl                      | 16 ++++++++++++----
 lib/asn1/test/asn1_SUITE_data/DoubleEllipses.asn | 12 ++++++++++++
 lib/asn1/test/testDoubleEllipses.erl             |  8 ++++++++
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/lib/asn1/src/asn1ct_gen.erl b/lib/asn1/src/asn1ct_gen.erl
index 450d309688..2ef8466309 100644
--- a/lib/asn1/src/asn1ct_gen.erl
+++ b/lib/asn1/src/asn1ct_gen.erl
@@ -1228,15 +1228,23 @@ gen_record(TorPtype,Name,Type,Num) when is_record(Type,type) ->
 			emit({"}).",nl,nl}),
 			Tr ++ ExtensionList2;
 		    {Rootl1,Extl,Rootl2} ->
+			case Rootl1 =/= [] andalso Extl++Rootl2 =/= [] of
+			    true -> emit([com]);
+			    false -> ok
+			end,
 			case Rootl1 of
-			    [] -> true;
-			    _ -> emit([",",nl])
+			    [_|_] -> emit([nl]);
+			    [] -> ok
 			end,
 			emit(["%% with extensions",nl]),
 			gen_record2(Name,'SEQUENCE',Extl,"",ext),
+			case Extl =/= [] andalso Rootl2 =/= [] of
+			    true -> emit([com]);
+			    false -> ok
+			end,
 			case Extl of
-			    [_H|_] when Rootl2 /= [] -> emit([",",nl]);
-			    _ -> ok
+			    [_|_] -> emit([nl]);
+			    [] -> ok
 			end,
 			emit(["%% end of extensions",nl]),
 			gen_record2(Name,'SEQUENCE',Rootl2,"",noext),
diff --git a/lib/asn1/test/asn1_SUITE_data/DoubleEllipses.asn b/lib/asn1/test/asn1_SUITE_data/DoubleEllipses.asn
index a96425cbea..846c3e7569 100644
--- a/lib/asn1/test/asn1_SUITE_data/DoubleEllipses.asn
+++ b/lib/asn1/test/asn1_SUITE_data/DoubleEllipses.asn
@@ -59,6 +59,18 @@ SeqAltV2 ::= SEQUENCE
    g INTEGER
  }
 
+SeqDoubleEmpty1 ::= SEQUENCE {
+   ...,
+   ...
+}
+
+SeqDoubleEmpty2 ::= SEQUENCE {
+   a BOOLEAN,
+   b INTEGER OPTIONAL,
+   ...,
+   ...
+}
+
 Set ::= SET {
    a  INTEGER,
    ...,
diff --git a/lib/asn1/test/testDoubleEllipses.erl b/lib/asn1/test/testDoubleEllipses.erl
index 3caa166ae0..bd6831bf1e 100644
--- a/lib/asn1/test/testDoubleEllipses.erl
+++ b/lib/asn1/test/testDoubleEllipses.erl
@@ -58,6 +58,14 @@ main(_Rules) ->
 	      #'SetAltV2'{a=10,d=12,
 			  b = <<2#1010:4>>,
 			  e=true,h="PS",i=13,c=false,f=14,g=16}),
+
+    roundtrip('SeqDoubleEmpty1',
+	      {'SeqDoubleEmpty1'}),
+    roundtrip('SeqDoubleEmpty2',
+	      {'SeqDoubleEmpty2',true,42}),
+    roundtrip('SeqDoubleEmpty2',
+	      {'SeqDoubleEmpty2',true,asn1_NOVALUE}),
+
     ok.
 
 roundtrip(T, V) ->
-- 
cgit v1.2.3