From 53c7e0127b9abe78926601534841080a497192ca Mon Sep 17 00:00:00 2001
From: Adam Knapp <adam.knapp@ericsson.com>
Date: Thu, 22 Jul 2021 16:50:17 +0200
Subject: [PATCH] JSON CROSSTAG OTHERWISE correction (issue #560)
Signed-off-by: Adam Knapp <adam.knapp@ericsson.com>
---
compiler2/record.c | 6 +-
.../EncodeDecode/JSON/issue560/.gitignore | 8 +
.../JSON/issue560/Issue560withJSON.ttcn | 40 +++++
.../EncodeDecode/JSON/issue560/Makefile | 149 ++++++++++++++++++
.../EncodeDecode/JSON/issue560/config.cfg | 20 +++
5 files changed, 222 insertions(+), 1 deletion(-)
create mode 100644 regression_test/EncodeDecode/JSON/issue560/.gitignore
create mode 100644 regression_test/EncodeDecode/JSON/issue560/Issue560withJSON.ttcn
create mode 100644 regression_test/EncodeDecode/JSON/issue560/Makefile
create mode 100644 regression_test/EncodeDecode/JSON/issue560/config.cfg
diff --git a/compiler2/record.c b/compiler2/record.c
index c17a6d748..45202169e 100644
--- a/compiler2/record.c
+++ b/compiler2/record.c
@@ -3466,13 +3466,17 @@ char* generate_json_decoder(char* src, const struct_def* sdef)
mprintf("%d", cur_choice->fieldnum) : mcopystr("CHOSEN_FIELD_OMITTED");
}
}
- if (otherwise_str != NULL) {
+ if (otherwise_str != NULL && !first_value) {
/* set chosen_field to the field index of the otherwise rule or -1 */
src = mputprintf(src,
" else {\n"
" chosen_field = %s;\n"
" }\n", otherwise_str);
Free(otherwise_str);
+ } else if (otherwise_str != NULL && first_value) {
+ src = mputprintf(src,
+ " chosen_field = %s;\n", otherwise_str);
+ Free(otherwise_str);
}
}
src = mputprintf(src,
diff --git a/regression_test/EncodeDecode/JSON/issue560/.gitignore b/regression_test/EncodeDecode/JSON/issue560/.gitignore
new file mode 100644
index 000000000..3b82791b6
--- /dev/null
+++ b/regression_test/EncodeDecode/JSON/issue560/.gitignore
@@ -0,0 +1,8 @@
+Issue560withJSON
+Issue560withJSON.exe
+Issue560withJSON*.cc
+Issue560withJSON*.hh
+*.d
+compile
+Issue560withJSON*.log
+result.txt
diff --git a/regression_test/EncodeDecode/JSON/issue560/Issue560withJSON.ttcn b/regression_test/EncodeDecode/JSON/issue560/Issue560withJSON.ttcn
new file mode 100644
index 000000000..cc9e7cfca
--- /dev/null
+++ b/regression_test/EncodeDecode/JSON/issue560/Issue560withJSON.ttcn
@@ -0,0 +1,40 @@
+/******************************************************************************
+ * Copyright (c) 2000-2021 Ericsson Telecom AB
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
+ *
+ * Contributors:
+ * Gabor, Szalai – initial implementation
+ *
+ ******************************************************************************/
+
+module Issue560withJSON {
+
+type union PCUIF_ContainerMsgUnion {
+ octetstring other
+}
+
+type record PCUIF_container {
+ integer msg_type,
+ PCUIF_ContainerMsgUnion u
+} with {
+ variant (u) "chosen (
+ other, otherwise)"
+};
+
+type component CT{}
+
+testcase tc_issue560_with_json() runs on CT {
+ // Compile test. If compiled then pass.
+ setverdict(pass)
+}
+
+control {
+ execute(tc_issue560_with_json());
+}
+
+} with {
+ encode "JSON"
+}
diff --git a/regression_test/EncodeDecode/JSON/issue560/Makefile b/regression_test/EncodeDecode/JSON/issue560/Makefile
new file mode 100644
index 000000000..209dcc67c
--- /dev/null
+++ b/regression_test/EncodeDecode/JSON/issue560/Makefile
@@ -0,0 +1,149 @@
+##############################################################################
+# Copyright (c) 2000-2021 Ericsson Telecom AB
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
+#
+# Contributors:
+# Gabor, Szalai – initial implementation
+#
+##############################################################################
+TOPDIR := ../../..
+include $(TOPDIR)/Makefile.regression
+
+# WARNING! This Makefile can be used with GNU make only.
+# Other versions of make may report syntax errors in it.
+
+#
+# Do NOT touch this line...
+#
+.PHONY: all archive check clean dep objects
+
+.SUFFIXES: .d
+
+#
+# Set these variables...
+#
+
+# Flags for dependency generation
+CXXDEPFLAGS = -MM
+
+ifeq ($(PLATFORM), WIN32)
+# Silence linker warnings.
+# Overridden by Makefile.cfg
+endif
+
+# Flags for the TTCN-3 and ASN.1 compiler:
+COMPILER_FLAGS +=
+
+# Execution mode: (either ttcn3 or ttcn3-parallel)
+TTCN3_LIB = ttcn3$(RT2_SUFFIX)$(DYNAMIC_SUFFIX)
+
+
+#
+# You may change these variables. Add your files if necessary...
+#
+
+# TTCN-3 modules of this project:
+TTCN3_MODULES = Issue560withJSON.ttcn
+
+# ASN.1 modules of this project:
+ASN1_MODULES =
+
+# C++ source & header files generated from the TTCN-3 & ASN.1 modules of
+# this project:
+GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc)
+GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh)
+ifdef SPLIT_TO_SLICES
+POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_))
+POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc))
+GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES)))
+GENERATED_SOURCES += $(GENERATED_SOURCES2)
+endif
+# C/C++ Source & header files of Test Ports, external functions and
+# other modules:
+USER_SOURCES =
+USER_HEADERS = $(USER_SOURCES:.cc=.hh)
+
+# Object files of this project that are needed for the executable test suite:
+OBJECTS = $(GENERATED_OBJECTS) $(USER_OBJECTS)
+
+GENERATED_OBJECTS = $(GENERATED_SOURCES:.cc=.o)
+
+USER_OBJECTS = $(USER_SOURCES:.cc=.o)
+
+DEPFILES = $(USER_OBJECTS:.o=.d) $(GENERATED_OBJECTS:.o=.d)
+
+
+# The name of the executable test suite:
+TARGET = Issue560$(EXESUFFIX)
+
+
+# Rules for building the executable...
+#
+
+all: $(TARGET)
+
+objects: $(OBJECTS) ;
+
+$(TARGET): $(OBJECTS)
+ if $(CXX) $(LDFLAGS) -o $@ $^ \
+ -L$(TTCN3_DIR)/lib -l$(TTCN3_LIB) \
+ -L$(OPENSSL_DIR)/lib -lcrypto \
+ -L$(XMLDIR)/lib $($(PLATFORM)_LIBS); \
+ then : ; else $(TTCN3_DIR)/bin/titanver $(OBJECTS); exit 1; fi
+
+.cc.o .c.o:
+ $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -o $@ $<
+
+.cc.d .c.d:
+ @echo Creating dependency file for '$<'; set -e; \
+ $(CXX) $(CXXDEPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $< \
+ | sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' > $@; \
+ [ -s $@ ] || rm -f $@
+
+$(GENERATED_SOURCES) $(GENERATED_HEADERS): compile
+ @if [ ! -f $@ ]; then $(RM) compile; $(MAKE) compile; fi
+
+compile: $(TTCN3_MODULES) $(ASN1_MODULES)
+ $(TTCN3_COMPILER) $(COMPILER_FLAGS) $^ - $?
+ touch $@
+
+
+clean:
+ -$(RM) $(TARGET) $(OBJECTS) $(GENERATED_HEADERS) \
+ $(GENERATED_SOURCES) compile $(DEPFILES) \
+ tags *.log
+
+distclean: clean
+ -$(RM) $(DEPFILES)
+
+
+dep: $(GENERATED_SOURCES) $(USER_SOURCES) ;
+
+ifeq ($(findstring n,$(MAKEFLAGS)),)
+ifeq ($(filter clean distclean check compile archive diag,$(MAKECMDGOALS)),)
+-include $(DEPFILES)
+endif
+endif
+
+
+
+diag:
+ $(TTCN3_COMPILER) -v 2>&1
+ $(TTCN3_DIR)/bin/mctr_cli -v 2>&1
+ $(CXX) -v 2>&1
+ @echo TTCN3_DIR=$(TTCN3_DIR)
+ @echo OPENSSL_DIR=$(OPENSSL_DIR)
+ @echo XMLDIR=$(XMLDIR)
+ @echo PLATFORM=$(PLATFORM)
+
+#
+# Add your rules here if necessary...
+#
+
+run: $(TARGET) ./config.cfg
+ ./$^ 2> result.txt
+ cat result.txt
+ grep "Overall verdict: pass" result.txt
diff --git a/regression_test/EncodeDecode/JSON/issue560/config.cfg b/regression_test/EncodeDecode/JSON/issue560/config.cfg
new file mode 100644
index 000000000..949c22a3a
--- /dev/null
+++ b/regression_test/EncodeDecode/JSON/issue560/config.cfg
@@ -0,0 +1,20 @@
+###############################################################################
+# Copyright (c) 2000-2021 Ericsson Telecom AB
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
+#
+# Contributors:
+# Botond, Baranyi
+#
+###############################################################################
+[LOGGING]
+LogFile := "Issue560withJSON.log"
+FileMask := LOG_ALL
+ConsoleMask := TTCN_ERROR | TTCN_TESTCASE | TTCN_STATISTICS
+LogSourceInfo := Yes
+[EXECUTE]
+Issue560withJSON.control
+
+[TESTPORT_PARAMETERS]
--
GitLab