diff --git a/Eclipse_Designer_userguide.doc b/Eclipse_Designer_userguide.doc index e89a617a74144b18c3eba0687512e59c4db57b29..0ca0154c28e9fb97f13cacc65a6a06cc0a0da3c5 100755 Binary files a/Eclipse_Designer_userguide.doc and b/Eclipse_Designer_userguide.doc differ diff --git a/Eclipse_Executor_userguide.doc b/Eclipse_Executor_userguide.doc index 799641eac09dd271e1ad096d9e9379a8c86162da..7e46ad45a11a2ffd7b884ae5fee9fad65fa54521 100644 Binary files a/Eclipse_Executor_userguide.doc and b/Eclipse_Executor_userguide.doc differ diff --git a/Eclipse_installationguide.doc b/Eclipse_installationguide.doc index dd2528c4569409800271be369390ec812c6f5dab..94c7b49efc66b3aaef1de1efbe5802988d7b2b28 100644 Binary files a/Eclipse_installationguide.doc and b/Eclipse_installationguide.doc differ diff --git a/README b/README index d81b0bbad5e7ff0aa7beed65722405a35da81e57..f1142eaccfc97cd73bae95a879c11eb3d65d46d7 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000-2014 Ericsson Telecom AB +# Copyright (c) 2000-2015 Ericsson Telecom AB # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -96,9 +96,9 @@ It modifies the source, you need to rebuild org.eclipse.titan.common plug-in pro 4.2. BUILDING TITAN PLUG-INS FROM COMMAND LINE WITH ANT -Building must be run from git/titan_eclipse/automatic_build +Building must be run from /titan_eclipse/automatic_build -In general +In general building from command line is done with this command: ant \ -f build_main.xml \ -D \ @@ -138,7 +138,7 @@ zip.dir: output directory for zip package that contains all the plug-ins (option These variables can be set by editing /titan_eclipse/automatic_build/build_config.xml and also in the command. -4.2.1. A working example with all of the dependencies (if all the values are set corretly, it will work with any target): +4.2.1. A working example with all of the dependencies (if all the values are set correctly, it will work with any target): LIB_DIR_LOCAL=$HOME/lib LIB_DIR_GIT=$HOME/git/titan_playground/jar diff --git a/Regression_test_project/src/MyExample.cfg b/Regression_test_project/src/MyExample.cfg index 2e37664a116eb212423d0f0b1184a5c8bd62c953..4b4e367b268d22381bb6528724928c27be21d508 100644 --- a/Regression_test_project/src/MyExample.cfg +++ b/Regression_test_project/src/MyExample.cfg @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000-2014 Ericsson Telecom AB +# Copyright (c) 2000-2015 Ericsson Telecom AB # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/MyExample.ttcn b/Regression_test_project/src/MyExample.ttcn index ea458ae0bc57cbd98e6a47226e4a2fcb45be008c..a4ab128e36b6704e6d60f9a7ead069499cf88421 100644 --- a/Regression_test_project/src/MyExample.ttcn +++ b/Regression_test_project/src/MyExample.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/PCOType.cc b/Regression_test_project/src/PCOType.cc index a4aa888bafd0eff87fd911a321cd470068fcc5cf..56bde56a9e57b5bc55cf6b4abef35cb760c570c2 100644 --- a/Regression_test_project/src/PCOType.cc +++ b/Regression_test_project/src/PCOType.cc @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2000-2014 Ericsson Telecom AB +// Copyright (c) 2000-2015 Ericsson Telecom AB // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 // which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/PCOType.hh b/Regression_test_project/src/PCOType.hh index 2c1f33d442e572a190c380635544e6298b7d7c56..4782f2c65590525b6f18717ec7f8606029824837 100644 --- a/Regression_test_project/src/PCOType.hh +++ b/Regression_test_project/src/PCOType.hh @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2000-2014 Ericsson Telecom AB +// Copyright (c) 2000-2015 Ericsson Telecom AB // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 // which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/altstep_coverage/altsteps.ttcn b/Regression_test_project/src/code_smells/altstep_coverage/altsteps.ttcn index b94521f33f7600630b9279a4621f6f028e2f3acb..f6d8c958a271f8e96ac4a340bde8d34ba2b6d275 100644 --- a/Regression_test_project/src/code_smells/altstep_coverage/altsteps.ttcn +++ b/Regression_test_project/src/code_smells/altstep_coverage/altsteps.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/circular_importation/import_cycle.ttcn b/Regression_test_project/src/code_smells/circular_importation/import_cycle.ttcn index 4d422a63bfe777d8b3e5b2bf9abb9b277feb71f5..a25e887d8cbbf4c7a477ccbab4414871f2699b3f 100644 --- a/Regression_test_project/src/code_smells/circular_importation/import_cycle.ttcn +++ b/Regression_test_project/src/code_smells/circular_importation/import_cycle.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/circular_importation/import_jang.ttcn b/Regression_test_project/src/code_smells/circular_importation/import_jang.ttcn index b508e3f54f229084119ca46acde2906fc9f63c48..9fa38a3a2fc8e74d08e5b200c04a775911f1d115 100644 --- a/Regression_test_project/src/code_smells/circular_importation/import_jang.ttcn +++ b/Regression_test_project/src/code_smells/circular_importation/import_jang.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/circular_importation/import_jin.ttcn b/Regression_test_project/src/code_smells/circular_importation/import_jin.ttcn index c25eb40a551c1b7436cdd6d1340efd7260a1d758..c427bc5df3cd4d802dd91bbf72cf75998616905e 100644 --- a/Regression_test_project/src/code_smells/circular_importation/import_jin.ttcn +++ b/Regression_test_project/src/code_smells/circular_importation/import_jin.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/empty_statement_block/block.ttcn b/Regression_test_project/src/code_smells/empty_statement_block/block.ttcn index 0ba12005c73bb39c573660752c303494f6418163..7e286c271951596ec4dc5c51760e86f33f4096bd 100644 --- a/Regression_test_project/src/code_smells/empty_statement_block/block.ttcn +++ b/Regression_test_project/src/code_smells/empty_statement_block/block.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/goto/say_no_to_goto.ttcn b/Regression_test_project/src/code_smells/goto/say_no_to_goto.ttcn index 1e02279ede90c7d526b6b54185be7dd25eaa56e6..1699ff9f79d2c07f84d4cb8b8cabf3c752db4b53 100644 --- a/Regression_test_project/src/code_smells/goto/say_no_to_goto.ttcn +++ b/Regression_test_project/src/code_smells/goto/say_no_to_goto.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/if_instead_altguard/altguard.ttcn b/Regression_test_project/src/code_smells/if_instead_altguard/altguard.ttcn index 8c27bf676b5e114b63ad7673315be23bb336f8fd..6b8f78467d9cd3fa1c8713ecc90af6e1a04bd02c 100644 --- a/Regression_test_project/src/code_smells/if_instead_altguard/altguard.ttcn +++ b/Regression_test_project/src/code_smells/if_instead_altguard/altguard.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/if_instead_receive_template/receive_template.ttcn b/Regression_test_project/src/code_smells/if_instead_receive_template/receive_template.ttcn index e4c538233938680ed84a74d546a25e510ddb466a..93b08bbeb7cabbbeb6a1493983ed31b5edc9c78f 100644 --- a/Regression_test_project/src/code_smells/if_instead_receive_template/receive_template.ttcn +++ b/Regression_test_project/src/code_smells/if_instead_receive_template/receive_template.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/if_without_else/ifelse.ttcn b/Regression_test_project/src/code_smells/if_without_else/ifelse.ttcn index 3c937f13c2aeae61c315a04d294d8646085194cc..fe2a50de75a05b36bd1b149d5863b1ed4a7ad490 100644 --- a/Regression_test_project/src/code_smells/if_without_else/ifelse.ttcn +++ b/Regression_test_project/src/code_smells/if_without_else/ifelse.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/incorrect_shift_rotate_size/shiftrotate.ttcn b/Regression_test_project/src/code_smells/incorrect_shift_rotate_size/shiftrotate.ttcn index 7a352eeb2beae072ef445b11c4ef11b093fe61af..5b4a0a62fbd694da8a25d1ee727792ea82ea2d5e 100644 --- a/Regression_test_project/src/code_smells/incorrect_shift_rotate_size/shiftrotate.ttcn +++ b/Regression_test_project/src/code_smells/incorrect_shift_rotate_size/shiftrotate.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/infinite_loop/loop.ttcn b/Regression_test_project/src/code_smells/infinite_loop/loop.ttcn index c41a00f8a39a1ee335fd20f7135381e88936efa3..b757e34f198e1f8877c02dfcdd8c14e5db205249 100644 --- a/Regression_test_project/src/code_smells/infinite_loop/loop.ttcn +++ b/Regression_test_project/src/code_smells/infinite_loop/loop.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/logic_inversion/logic.ttcn b/Regression_test_project/src/code_smells/logic_inversion/logic.ttcn index 59a7cf049395b6baf3a6ec67ca82ccc0401fdf90..c36c0f4f04161e933bec4c5c9b96eac90e5a878e 100644 --- a/Regression_test_project/src/code_smells/logic_inversion/logic.ttcn +++ b/Regression_test_project/src/code_smells/logic_inversion/logic.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/magic_number/magic_number.ttcn b/Regression_test_project/src/code_smells/magic_number/magic_number.ttcn index d2e642a511c569b650f5ff98f780d43fdc43ff39..662a65c929e0c3cd0200a087ac44ce908f092ea6 100644 --- a/Regression_test_project/src/code_smells/magic_number/magic_number.ttcn +++ b/Regression_test_project/src/code_smells/magic_number/magic_number.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/magic_string/magic_string.ttcn b/Regression_test_project/src/code_smells/magic_string/magic_string.ttcn index 4017c649659899bc55bd384c4e21ad9240ad1c58..2422151d2dfe90d8f31c046b757240311d2ccdeb 100644 --- a/Regression_test_project/src/code_smells/magic_string/magic_string.ttcn +++ b/Regression_test_project/src/code_smells/magic_string/magic_string.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/missing_friend/buddy.ttcn b/Regression_test_project/src/code_smells/missing_friend/buddy.ttcn index b6f0c3b1edd3d016beb032992ee1c4ef6e91189e..9aa540fd9c5957bde352cd7bd0588017ca51b5bd 100644 --- a/Regression_test_project/src/code_smells/missing_friend/buddy.ttcn +++ b/Regression_test_project/src/code_smells/missing_friend/buddy.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/missing_friend/guy.ttcn b/Regression_test_project/src/code_smells/missing_friend/guy.ttcn index 6f19f5834d6d2e50d131e8b0d49b776a9ae9b090..91c333fb556ab98421088edc7d32c1b9714414b0 100644 --- a/Regression_test_project/src/code_smells/missing_friend/guy.ttcn +++ b/Regression_test_project/src/code_smells/missing_friend/guy.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/missing_import/imported_2.ttcn b/Regression_test_project/src/code_smells/missing_import/imported_2.ttcn index b34081d1ec6a566b06b702801f472203d57c0bba..1bb123e9f24b23d4c73a4ebf77badd6788d76934 100644 --- a/Regression_test_project/src/code_smells/missing_import/imported_2.ttcn +++ b/Regression_test_project/src/code_smells/missing_import/imported_2.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/missing_import/importer.ttcn b/Regression_test_project/src/code_smells/missing_import/importer.ttcn index 7b81a70ed42029dccb145ad0bfb9596209e22aea..9609ba80d03c0e98b6ac93d71a61ffcfcfb10df1 100644 --- a/Regression_test_project/src/code_smells/missing_import/importer.ttcn +++ b/Regression_test_project/src/code_smells/missing_import/importer.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/modulename_in_definition/modulename.ttcn b/Regression_test_project/src/code_smells/modulename_in_definition/modulename.ttcn index ae7bbf1fd6e7ef82cc9bc35af06e9ff4de0520de..c7f11f423333be6c05e028b22e4cc4715ca50cc9 100644 --- a/Regression_test_project/src/code_smells/modulename_in_definition/modulename.ttcn +++ b/Regression_test_project/src/code_smells/modulename_in_definition/modulename.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/nonprivate_private/nonprivate.ttcn b/Regression_test_project/src/code_smells/nonprivate_private/nonprivate.ttcn index e49ccab6dd1cc68519c41a7f89bffadca777b46f..1ad1c72c2bfda464570c77010ad80defa20f4f2a 100644 --- a/Regression_test_project/src/code_smells/nonprivate_private/nonprivate.ttcn +++ b/Regression_test_project/src/code_smells/nonprivate_private/nonprivate.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/nonprivate_private/referrer.ttcn b/Regression_test_project/src/code_smells/nonprivate_private/referrer.ttcn index 5bc270d56991136008a0ec139a1a38557c39cd41..cc8418d66976b1e0200b10c81b54a4c1f85920fb 100644 --- a/Regression_test_project/src/code_smells/nonprivate_private/referrer.ttcn +++ b/Regression_test_project/src/code_smells/nonprivate_private/referrer.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/readonly_inout_param/ro_inout.ttcn b/Regression_test_project/src/code_smells/readonly_inout_param/ro_inout.ttcn index c0eab8a45668b8ad1fa57ff2fd855da67dd6e1b5..28373da6488e364bd78d6a79bbe528d1308e982b 100644 --- a/Regression_test_project/src/code_smells/readonly_inout_param/ro_inout.ttcn +++ b/Regression_test_project/src/code_smells/readonly_inout_param/ro_inout.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/readonly_loc_variable/ro_loc.ttcn b/Regression_test_project/src/code_smells/readonly_loc_variable/ro_loc.ttcn index f2c5381af1abe694fe02f42de26f7cd21b90d67e..cd0e7ce81554a42662fd906afae4c152000d23c1 100644 --- a/Regression_test_project/src/code_smells/readonly_loc_variable/ro_loc.ttcn +++ b/Regression_test_project/src/code_smells/readonly_loc_variable/ro_loc.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/readonly_out_param/ro_out.ttcn b/Regression_test_project/src/code_smells/readonly_out_param/ro_out.ttcn index 10da567271895ce8173d1ad21382d9fc9540d96f..a52e8d7e048895ff525343ed1ce23e7e6adcdf9e 100644 --- a/Regression_test_project/src/code_smells/readonly_out_param/ro_out.ttcn +++ b/Regression_test_project/src/code_smells/readonly_out_param/ro_out.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/receive_any_template/any_template.ttcn b/Regression_test_project/src/code_smells/receive_any_template/any_template.ttcn index 8eb40c64b0665db2d061365a0e772657e88f7758..e398e7ce650f5fbd566a6a8d70a12c3f47dd36ec 100644 --- a/Regression_test_project/src/code_smells/receive_any_template/any_template.ttcn +++ b/Regression_test_project/src/code_smells/receive_any_template/any_template.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/setverdict_without_reason/verdict.ttcn b/Regression_test_project/src/code_smells/setverdict_without_reason/verdict.ttcn index 796fb5a0481c9b702de239f8dfae3e7d2ec12442..3b2a5003eba75d5b038f1e9c3aa81a6849653d6f 100644 --- a/Regression_test_project/src/code_smells/setverdict_without_reason/verdict.ttcn +++ b/Regression_test_project/src/code_smells/setverdict_without_reason/verdict.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/sizecheck_in_loop/sizecheck.ttcn b/Regression_test_project/src/code_smells/sizecheck_in_loop/sizecheck.ttcn index ea1b553cb5cf4b33b559054eef18a7e31e810b8a..174d5a64030fa3f5191f7bb0c718ff203647a861 100644 --- a/Regression_test_project/src/code_smells/sizecheck_in_loop/sizecheck.ttcn +++ b/Regression_test_project/src/code_smells/sizecheck_in_loop/sizecheck.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/stop_in_function/stop_func.ttcn b/Regression_test_project/src/code_smells/stop_in_function/stop_func.ttcn index 7fd54f2306a898209dd6a6acc114d200b0f92bee..4d3bca397c3656b50d9e01be5c71e1010f4af289 100644 --- a/Regression_test_project/src/code_smells/stop_in_function/stop_func.ttcn +++ b/Regression_test_project/src/code_smells/stop_in_function/stop_func.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/switch_on_boolean/switch_bool.ttcn b/Regression_test_project/src/code_smells/switch_on_boolean/switch_bool.ttcn index 5b30ad17b877fcf09e08d0ca5edecfafe77533b4..1182d6e80d64d9c2363cf61f03e9a147deee9e79 100644 --- a/Regression_test_project/src/code_smells/switch_on_boolean/switch_bool.ttcn +++ b/Regression_test_project/src/code_smells/switch_on_boolean/switch_bool.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/too_complex_expression/complex_expr.ttcn b/Regression_test_project/src/code_smells/too_complex_expression/complex_expr.ttcn index 85ee7ce629a5aabf5b0a5bc056e0354d04ff9463..1849e4e39271fc08e29fe8129f8ff98e71e6658c 100644 --- a/Regression_test_project/src/code_smells/too_complex_expression/complex_expr.ttcn +++ b/Regression_test_project/src/code_smells/too_complex_expression/complex_expr.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/too_many_parameters/many_param.ttcn b/Regression_test_project/src/code_smells/too_many_parameters/many_param.ttcn index 10e1b858e6ba63ae0211e76e23eaac1ab0129bec..7f0d0d11cd1967d26dcbb8b6c0b3829d5865cdd3 100644 --- a/Regression_test_project/src/code_smells/too_many_parameters/many_param.ttcn +++ b/Regression_test_project/src/code_smells/too_many_parameters/many_param.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/too_many_statements/many_statements.ttcn b/Regression_test_project/src/code_smells/too_many_statements/many_statements.ttcn index 90720ef04676863f7310fa6affb3d26a8d7b6e8a..32f00803b93f2fd1a249cad01a8cdcf0d1cb8c14 100644 --- a/Regression_test_project/src/code_smells/too_many_statements/many_statements.ttcn +++ b/Regression_test_project/src/code_smells/too_many_statements/many_statements.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/typename_in_definition/type_in_def.ttcn b/Regression_test_project/src/code_smells/typename_in_definition/type_in_def.ttcn index 74fc5666e0407afa23301c8f9c98dab0829a5acd..e0a351eca8ad5dd7e36da25447742ab4e7f27a69 100644 --- a/Regression_test_project/src/code_smells/typename_in_definition/type_in_def.ttcn +++ b/Regression_test_project/src/code_smells/typename_in_definition/type_in_def.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/types.ttcn b/Regression_test_project/src/code_smells/types.ttcn index 4a4c0dca2ad1ab7e3a19f60bfce3f130bb947a6d..fbed2a0a8ce0e21c7ca017e09f1925c2233c7e8f 100644 --- a/Regression_test_project/src/code_smells/types.ttcn +++ b/Regression_test_project/src/code_smells/types.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/uncommented_function/no_comment.ttcn b/Regression_test_project/src/code_smells/uncommented_function/no_comment.ttcn index 820cfacb0b6f8ffbedd500399a08ff39bc8456d9..77f1bf5e540ea6661dccbdba911024cd89fe108c 100644 --- a/Regression_test_project/src/code_smells/uncommented_function/no_comment.ttcn +++ b/Regression_test_project/src/code_smells/uncommented_function/no_comment.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/uninitialized_variable/init_var.ttcn b/Regression_test_project/src/code_smells/uninitialized_variable/init_var.ttcn index 2655a7bf05185a1bf60b6176b14511fe8c9b9ff4..7820209db1d34598f1663a019be4c4aa4d8a1f73 100644 --- a/Regression_test_project/src/code_smells/uninitialized_variable/init_var.ttcn +++ b/Regression_test_project/src/code_smells/uninitialized_variable/init_var.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/unnecessary_control/overcomp.ttcn b/Regression_test_project/src/code_smells/unnecessary_control/overcomp.ttcn index b4b99d3b25a0dd2b81282e214743af6395c064f1..c109415dfb12b879e70ec6ee62cb70e93c19d1f7 100644 --- a/Regression_test_project/src/code_smells/unnecessary_control/overcomp.ttcn +++ b/Regression_test_project/src/code_smells/unnecessary_control/overcomp.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/unnecessary_valueof/omit_valueof.ttcn b/Regression_test_project/src/code_smells/unnecessary_valueof/omit_valueof.ttcn index f33d3e8212e76b7706aa21b12998ef86a83f020a..1aeabfa55a2db2ecfa348f77353b613b0681da32 100644 --- a/Regression_test_project/src/code_smells/unnecessary_valueof/omit_valueof.ttcn +++ b/Regression_test_project/src/code_smells/unnecessary_valueof/omit_valueof.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/unused_function_return_values/omit_retval.ttcn b/Regression_test_project/src/code_smells/unused_function_return_values/omit_retval.ttcn index fdd1df9003923b075e30a8c755f3b67abec02b93..b344344d8c425c1ea6def205ee7221f001015f42 100644 --- a/Regression_test_project/src/code_smells/unused_function_return_values/omit_retval.ttcn +++ b/Regression_test_project/src/code_smells/unused_function_return_values/omit_retval.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/unused_global_definition/unused_global.ttcn b/Regression_test_project/src/code_smells/unused_global_definition/unused_global.ttcn index 30337e8feb8c84b7050cb5a18d7156300b0f34af..b79e1950d33842e981ac68f2db515dd0d797b5db 100644 --- a/Regression_test_project/src/code_smells/unused_global_definition/unused_global.ttcn +++ b/Regression_test_project/src/code_smells/unused_global_definition/unused_global.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/unused_import/unused_import.ttcn b/Regression_test_project/src/code_smells/unused_import/unused_import.ttcn index cf0fd008ccb47c2d076dcadb648cae1b27116bd4..b21f086549f10106c5dab0b9e50755ae19f6b7cb 100644 --- a/Regression_test_project/src/code_smells/unused_import/unused_import.ttcn +++ b/Regression_test_project/src/code_smells/unused_import/unused_import.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/unused_local_definition/unused_local.ttcn b/Regression_test_project/src/code_smells/unused_local_definition/unused_local.ttcn index dc16de7e1591c4922948103712898a832ebb13e6..08ab38d6ab336064d70b38ab8d1e1fa7ea4dbbd0 100644 --- a/Regression_test_project/src/code_smells/unused_local_definition/unused_local.ttcn +++ b/Regression_test_project/src/code_smells/unused_local_definition/unused_local.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/unused_started_function_return_values/omit_started_retval.ttcn b/Regression_test_project/src/code_smells/unused_started_function_return_values/omit_started_retval.ttcn index d8d0b15e308281cb5442f86394cd30eb7e4a8661..4e25bd3e3d22149adf277007f9a143cf43d7a60b 100644 --- a/Regression_test_project/src/code_smells/unused_started_function_return_values/omit_started_retval.ttcn +++ b/Regression_test_project/src/code_smells/unused_started_function_return_values/omit_started_retval.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/code_smells/visibility_in_definition/visibility.ttcn b/Regression_test_project/src/code_smells/visibility_in_definition/visibility.ttcn index 97a7d76525492bd3427e396072630e1507f73fd8..217733574e274f77c5d31f0adfde1a3adbcb4107 100644 --- a/Regression_test_project/src/code_smells/visibility_in_definition/visibility.ttcn +++ b/Regression_test_project/src/code_smells/visibility_in_definition/visibility.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/graph_tests/test1/src/a.ttcn3 b/Regression_test_project/src/graph_tests/test1/src/a.ttcn3 index d841df892725ef6852d3cda1f23d47453c7bbdb9..9731baa32fb2b9c00f335d436a6ecc14d8eed2f9 100644 --- a/Regression_test_project/src/graph_tests/test1/src/a.ttcn3 +++ b/Regression_test_project/src/graph_tests/test1/src/a.ttcn3 @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/graph_tests/test1/src/b.ttcn3 b/Regression_test_project/src/graph_tests/test1/src/b.ttcn3 index f1cb1abe521260e92b15c96500e2608b09ada46b..6c30a359b90f50be4e9eefaf2e77acfe6b414bc7 100644 --- a/Regression_test_project/src/graph_tests/test1/src/b.ttcn3 +++ b/Regression_test_project/src/graph_tests/test1/src/b.ttcn3 @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/graph_tests/test1/src/c.ttcn3 b/Regression_test_project/src/graph_tests/test1/src/c.ttcn3 index 7eff0ee1a64cdff18cd25613c90ee06e7a8ffbac..276be04010f98a705ebb2783b308ac0c3c033421 100644 --- a/Regression_test_project/src/graph_tests/test1/src/c.ttcn3 +++ b/Regression_test_project/src/graph_tests/test1/src/c.ttcn3 @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/graph_tests/test1/src/d.ttcn3 b/Regression_test_project/src/graph_tests/test1/src/d.ttcn3 index 1691826d3e5cdff34fbffac5d5a587c903fac762..ebd2e3a17d11302482d06cdb6320c6cd5873211e 100644 --- a/Regression_test_project/src/graph_tests/test1/src/d.ttcn3 +++ b/Regression_test_project/src/graph_tests/test1/src/d.ttcn3 @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/graph_tests/test1/src/e.ttcn3 b/Regression_test_project/src/graph_tests/test1/src/e.ttcn3 index 4eba6a97b986e5a2af6af25ba3bd7072f3d84fda..83cca159a90ba7814d29d596d499859f412ba60c 100644 --- a/Regression_test_project/src/graph_tests/test1/src/e.ttcn3 +++ b/Regression_test_project/src/graph_tests/test1/src/e.ttcn3 @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/graph_tests/test1/src/f.ttcn3 b/Regression_test_project/src/graph_tests/test1/src/f.ttcn3 index 78bee97419d14596dd4b90004b14acc9f2f62df0..e290a5b47cfcdebf590a909956f80360c0b2b57d 100644 --- a/Regression_test_project/src/graph_tests/test1/src/f.ttcn3 +++ b/Regression_test_project/src/graph_tests/test1/src/f.ttcn3 @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/graph_tests/test1/src/g.ttcn3 b/Regression_test_project/src/graph_tests/test1/src/g.ttcn3 index a0ce015741cab95fcaff3fb68017e8e7ae8fe656..e79b00534ea26b1eada747dd9697a4c3b57c070e 100644 --- a/Regression_test_project/src/graph_tests/test1/src/g.ttcn3 +++ b/Regression_test_project/src/graph_tests/test1/src/g.ttcn3 @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/graph_tests/test2/src/A_Module.ttcn3 b/Regression_test_project/src/graph_tests/test2/src/A_Module.ttcn3 index f27fc454023590d6315034ccd8fdbfd4b765315e..774177ea0a7055752b8f66cf6a28885d6d401306 100644 --- a/Regression_test_project/src/graph_tests/test2/src/A_Module.ttcn3 +++ b/Regression_test_project/src/graph_tests/test2/src/A_Module.ttcn3 @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/AM_Branches/AM_Branches.ttcn b/Regression_test_project/src/metrics/AM_Branches/AM_Branches.ttcn index cfe0770b060b6e376fcbd666cb46bbd8918a0541..e8c39f4be74353beb39b6288e967a48a65e84807 100644 --- a/Regression_test_project/src/metrics/AM_Branches/AM_Branches.ttcn +++ b/Regression_test_project/src/metrics/AM_Branches/AM_Branches.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/AM_CyclomaticComplexity/AM_CyclomaticComplexity.ttcn b/Regression_test_project/src/metrics/AM_CyclomaticComplexity/AM_CyclomaticComplexity.ttcn index 6e4be93ebe4ba7bdeb709455e8abb93f91d56455..95a36f1c54ad3a132b904ab1d483c1afd92a0f90 100644 --- a/Regression_test_project/src/metrics/AM_CyclomaticComplexity/AM_CyclomaticComplexity.ttcn +++ b/Regression_test_project/src/metrics/AM_CyclomaticComplexity/AM_CyclomaticComplexity.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/AM_InEnvy/AM_InEnvy.ttcn b/Regression_test_project/src/metrics/AM_InEnvy/AM_InEnvy.ttcn index 028f5235101367df92ca2618b6d1aa66b5cdf51f..8c6f7f4d79dc2e8737ca665da7eefc693c1a9dac 100644 --- a/Regression_test_project/src/metrics/AM_InEnvy/AM_InEnvy.ttcn +++ b/Regression_test_project/src/metrics/AM_InEnvy/AM_InEnvy.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/AM_LinesOfCode/AM_LinesOfCode.ttcn b/Regression_test_project/src/metrics/AM_LinesOfCode/AM_LinesOfCode.ttcn index 8148dd58f9ed2dc9174da1b3845ab417a85d49ab..a72cf4a715fed8222cf71ea5521debd04780e0a7 100644 --- a/Regression_test_project/src/metrics/AM_LinesOfCode/AM_LinesOfCode.ttcn +++ b/Regression_test_project/src/metrics/AM_LinesOfCode/AM_LinesOfCode.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/AM_Nesting/AM_Nesting.ttcn b/Regression_test_project/src/metrics/AM_Nesting/AM_Nesting.ttcn index 5d18f37b3eb832c7bcae164c4f66abb6a8e59587..148bfe402bb7579cac02a32b0fce9ab11d7fad0c 100644 --- a/Regression_test_project/src/metrics/AM_Nesting/AM_Nesting.ttcn +++ b/Regression_test_project/src/metrics/AM_Nesting/AM_Nesting.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/AM_NumberOfParams/AM_NumberOfParams.ttcn b/Regression_test_project/src/metrics/AM_NumberOfParams/AM_NumberOfParams.ttcn index d7cc14781c722551065d4b802c1939782c86f69d..1cc41a26c914903ee8957296df49e20b92ae9258 100644 --- a/Regression_test_project/src/metrics/AM_NumberOfParams/AM_NumberOfParams.ttcn +++ b/Regression_test_project/src/metrics/AM_NumberOfParams/AM_NumberOfParams.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/AM_OutEnvy/AM_OutEnvy.ttcn b/Regression_test_project/src/metrics/AM_OutEnvy/AM_OutEnvy.ttcn index 9a0cdb16d7a4329286a8d63319f509d6f5649c8f..fa548781a1ba11bcff840f0dc96d068e2a140f22 100644 --- a/Regression_test_project/src/metrics/AM_OutEnvy/AM_OutEnvy.ttcn +++ b/Regression_test_project/src/metrics/AM_OutEnvy/AM_OutEnvy.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/FM_CyclomaticComplexity/FM_CyclomaticComplexity.ttcn b/Regression_test_project/src/metrics/FM_CyclomaticComplexity/FM_CyclomaticComplexity.ttcn index 7fadac057bfc5ff0b2e6cb0218edb71090470b3a..e3468bab97f3253169344447b8517c6748b72010 100644 --- a/Regression_test_project/src/metrics/FM_CyclomaticComplexity/FM_CyclomaticComplexity.ttcn +++ b/Regression_test_project/src/metrics/FM_CyclomaticComplexity/FM_CyclomaticComplexity.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/FM_DefaultActivations/FM_DefaultActivations.ttcn b/Regression_test_project/src/metrics/FM_DefaultActivations/FM_DefaultActivations.ttcn index 4fea80da47c0490467b68f6b005d55b192428cba..68694f45ca409c32ed2829f6685f91175294a183 100644 --- a/Regression_test_project/src/metrics/FM_DefaultActivations/FM_DefaultActivations.ttcn +++ b/Regression_test_project/src/metrics/FM_DefaultActivations/FM_DefaultActivations.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/FM_InEnvy/FM_InEnvy.ttcn b/Regression_test_project/src/metrics/FM_InEnvy/FM_InEnvy.ttcn index 8e7745b58b69f3c1af366fe6842b2e0f11bcc0f4..42c1c889d258605debef5b2a9dd72a2009f9aa0b 100644 --- a/Regression_test_project/src/metrics/FM_InEnvy/FM_InEnvy.ttcn +++ b/Regression_test_project/src/metrics/FM_InEnvy/FM_InEnvy.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/FM_LinesOfCode/FM_LinesOfCode.ttcn b/Regression_test_project/src/metrics/FM_LinesOfCode/FM_LinesOfCode.ttcn index 27687da4ceda6d38bb8c5885516f9d010f1328d2..bd057fca797972b96384bfe3dc63e373ed248c7d 100644 --- a/Regression_test_project/src/metrics/FM_LinesOfCode/FM_LinesOfCode.ttcn +++ b/Regression_test_project/src/metrics/FM_LinesOfCode/FM_LinesOfCode.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/FM_Nesting/FM_Nesting.ttcn b/Regression_test_project/src/metrics/FM_Nesting/FM_Nesting.ttcn index 0cdf25fc0b47f4be5910b07686ee030cfc9d3bf7..3606eef8a3dfb73ddac9137e71c318bbb106f035 100644 --- a/Regression_test_project/src/metrics/FM_Nesting/FM_Nesting.ttcn +++ b/Regression_test_project/src/metrics/FM_Nesting/FM_Nesting.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/FM_NumberOfParams/FM_NumberOfParams.ttcn b/Regression_test_project/src/metrics/FM_NumberOfParams/FM_NumberOfParams.ttcn index 26f4e6108ddadd7a2f2b679c5d88e83ad82d4d5e..150bebc8e2eaeaea637c4bfb078b9e52824babc8 100644 --- a/Regression_test_project/src/metrics/FM_NumberOfParams/FM_NumberOfParams.ttcn +++ b/Regression_test_project/src/metrics/FM_NumberOfParams/FM_NumberOfParams.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/FM_OutEnvy/FM_OutEnvy.ttcn b/Regression_test_project/src/metrics/FM_OutEnvy/FM_OutEnvy.ttcn index 51c311c00a8bf1bec1605298a1b38b19916e032f..6fc1642bcff7dadb71c7ea200a1ddfe64700504d 100644 --- a/Regression_test_project/src/metrics/FM_OutEnvy/FM_OutEnvy.ttcn +++ b/Regression_test_project/src/metrics/FM_OutEnvy/FM_OutEnvy.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/FM_ReturnPoints/FM_ReturnPoints.ttcn b/Regression_test_project/src/metrics/FM_ReturnPoints/FM_ReturnPoints.ttcn index 1914a84edbac8c0ee2e6409b0c9cd01ea89caff8..adac3821905b5c522c611a7c0d00166633056e98 100644 --- a/Regression_test_project/src/metrics/FM_ReturnPoints/FM_ReturnPoints.ttcn +++ b/Regression_test_project/src/metrics/FM_ReturnPoints/FM_ReturnPoints.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/FM_ReturnPoints/FM_ReturnPoints2.ttcn b/Regression_test_project/src/metrics/FM_ReturnPoints/FM_ReturnPoints2.ttcn index 72b495b9746eb6b3ab11e65a5443f2b2d355bb73..6bda04803da81610da18a2a20f9536e5007c2396 100644 --- a/Regression_test_project/src/metrics/FM_ReturnPoints/FM_ReturnPoints2.ttcn +++ b/Regression_test_project/src/metrics/FM_ReturnPoints/FM_ReturnPoints2.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/MM_AfferentCoupling/MM_AfferentCoupling.ttcn b/Regression_test_project/src/metrics/MM_AfferentCoupling/MM_AfferentCoupling.ttcn index 6a84585c545ab753e83f64c863ff43affc9475b3..9ca7cfd3329e398dd239d2273827e170c3b32f52 100644 --- a/Regression_test_project/src/metrics/MM_AfferentCoupling/MM_AfferentCoupling.ttcn +++ b/Regression_test_project/src/metrics/MM_AfferentCoupling/MM_AfferentCoupling.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/MM_AfferentCoupling/MM_AfferentCoupling2.ttcn b/Regression_test_project/src/metrics/MM_AfferentCoupling/MM_AfferentCoupling2.ttcn index 8b5487851718bb6e8d5e6d1f62ebf8c9e1de0e7c..e25522d0a450f07285664749f1b2961de79ff6a6 100644 --- a/Regression_test_project/src/metrics/MM_AfferentCoupling/MM_AfferentCoupling2.ttcn +++ b/Regression_test_project/src/metrics/MM_AfferentCoupling/MM_AfferentCoupling2.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/MM_EfferentCoupling/MM_EfferentCoupling.ttcn b/Regression_test_project/src/metrics/MM_EfferentCoupling/MM_EfferentCoupling.ttcn index b8740805050e06924be8acfa7685d67c1378dae4..53cdd414b3e5938e4b1dc7da86140f6891aeaf57 100644 --- a/Regression_test_project/src/metrics/MM_EfferentCoupling/MM_EfferentCoupling.ttcn +++ b/Regression_test_project/src/metrics/MM_EfferentCoupling/MM_EfferentCoupling.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/MM_InEnvy/MM_InEnvy.ttcn b/Regression_test_project/src/metrics/MM_InEnvy/MM_InEnvy.ttcn index 4ee9cac3eab2c20a4e4c93b06d052d76fa58f709..3a9262ffd5a88c43884297b8bbcc26aaa4036092 100644 --- a/Regression_test_project/src/metrics/MM_InEnvy/MM_InEnvy.ttcn +++ b/Regression_test_project/src/metrics/MM_InEnvy/MM_InEnvy.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/MM_Instability/MM_Instability.ttcn b/Regression_test_project/src/metrics/MM_Instability/MM_Instability.ttcn index 98e8d078ea05160f4062537413a53ef02df7f40f..a01fbb77fe88f157bde62fefa34b843091604480 100644 --- a/Regression_test_project/src/metrics/MM_Instability/MM_Instability.ttcn +++ b/Regression_test_project/src/metrics/MM_Instability/MM_Instability.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/MM_Instability/MM_Instability2.ttcn b/Regression_test_project/src/metrics/MM_Instability/MM_Instability2.ttcn index e2f9e8f41b3458c4a4a8a9d3178591b12eb70ed0..9acd69eb41ea4016be45d803c798ccd32abc8e1e 100644 --- a/Regression_test_project/src/metrics/MM_Instability/MM_Instability2.ttcn +++ b/Regression_test_project/src/metrics/MM_Instability/MM_Instability2.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/MM_LinesOfCode/MM_LinesOfCode.ttcn b/Regression_test_project/src/metrics/MM_LinesOfCode/MM_LinesOfCode.ttcn index 7163e757da52aa536e69cba0b96504c1082246dd..68014bfbb72563f332eabe733fb7aeffc8c17913 100644 --- a/Regression_test_project/src/metrics/MM_LinesOfCode/MM_LinesOfCode.ttcn +++ b/Regression_test_project/src/metrics/MM_LinesOfCode/MM_LinesOfCode.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/MM_NofAltsteps/MM_NofAltsteps.ttcn b/Regression_test_project/src/metrics/MM_NofAltsteps/MM_NofAltsteps.ttcn index 9cf59a3d43b61fcc638f626482cad28a065efc04..bac57dfab9701b911910c2db2d037a4f6646c814 100644 --- a/Regression_test_project/src/metrics/MM_NofAltsteps/MM_NofAltsteps.ttcn +++ b/Regression_test_project/src/metrics/MM_NofAltsteps/MM_NofAltsteps.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/MM_NofFixme/MM_NofFixme.ttcn b/Regression_test_project/src/metrics/MM_NofFixme/MM_NofFixme.ttcn index 853e0c4c39ae7a69880321cfca836ebccdb4347f..c2cbea1af780813a3eca701549f4e9cb8cbacc08 100644 --- a/Regression_test_project/src/metrics/MM_NofFixme/MM_NofFixme.ttcn +++ b/Regression_test_project/src/metrics/MM_NofFixme/MM_NofFixme.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/MM_NofFunctions/MM_NofFunctions.ttcn b/Regression_test_project/src/metrics/MM_NofFunctions/MM_NofFunctions.ttcn index 2b6fbfa6ea2fd4fee12f44d341d04db78cd0a3f7..8ee1ad16c09f286fa78b946ddc6f2d47dcac3057 100644 --- a/Regression_test_project/src/metrics/MM_NofFunctions/MM_NofFunctions.ttcn +++ b/Regression_test_project/src/metrics/MM_NofFunctions/MM_NofFunctions.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/MM_NofImports/MM_NofImports.ttcn b/Regression_test_project/src/metrics/MM_NofImports/MM_NofImports.ttcn index a16080fae3c6a599efeaf069e0df76fba7479cad..11c9960352267a74efe914af20971b47bd48c860 100644 --- a/Regression_test_project/src/metrics/MM_NofImports/MM_NofImports.ttcn +++ b/Regression_test_project/src/metrics/MM_NofImports/MM_NofImports.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/MM_NofTestcases/MM_NofTestcases.ttcn b/Regression_test_project/src/metrics/MM_NofTestcases/MM_NofTestcases.ttcn index e46ade9322c2faaf980a4df4a3ca291d68d0d4b3..9381dfe968b25348875bbaf04463916ce2189c3d 100644 --- a/Regression_test_project/src/metrics/MM_NofTestcases/MM_NofTestcases.ttcn +++ b/Regression_test_project/src/metrics/MM_NofTestcases/MM_NofTestcases.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/MM_OutEnvy/MM_OutEnvy.ttcn b/Regression_test_project/src/metrics/MM_OutEnvy/MM_OutEnvy.ttcn index 29573c8446e0f6a3bbe79e82598ac52513a31927..e7c73e1623bbaed02dbfc0e35f4c09beabc9ea3a 100644 --- a/Regression_test_project/src/metrics/MM_OutEnvy/MM_OutEnvy.ttcn +++ b/Regression_test_project/src/metrics/MM_OutEnvy/MM_OutEnvy.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/MM_TimesImported/MM_TimesImported.ttcn b/Regression_test_project/src/metrics/MM_TimesImported/MM_TimesImported.ttcn index c4e4960b1b880d7aba96eebb8bb53ccdab51afde..dd1129786c22e90fca52e301d0210e5fe9aed001 100644 --- a/Regression_test_project/src/metrics/MM_TimesImported/MM_TimesImported.ttcn +++ b/Regression_test_project/src/metrics/MM_TimesImported/MM_TimesImported.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/MM_TimesImported/MM_TimesImportee1.ttcn b/Regression_test_project/src/metrics/MM_TimesImported/MM_TimesImportee1.ttcn index 6ad5411dacf9ff454ffbfa86064dcd0b84c81917..1c8bab1d7bbb4ecf8a019c07efb1fa22ca37d09d 100644 --- a/Regression_test_project/src/metrics/MM_TimesImported/MM_TimesImportee1.ttcn +++ b/Regression_test_project/src/metrics/MM_TimesImported/MM_TimesImportee1.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/MM_TimesImported/MM_TimesImportee2.ttcn b/Regression_test_project/src/metrics/MM_TimesImported/MM_TimesImportee2.ttcn index bc9d0b6c3a43a515f0a5446ebc26f5e9fe3b829d..bf94752786615a8f2823fa9a97dc5b16117d1b8a 100644 --- a/Regression_test_project/src/metrics/MM_TimesImported/MM_TimesImportee2.ttcn +++ b/Regression_test_project/src/metrics/MM_TimesImported/MM_TimesImportee2.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/TM_CyclomaticComplexity/TM_CyclomaticComplexity.ttcn b/Regression_test_project/src/metrics/TM_CyclomaticComplexity/TM_CyclomaticComplexity.ttcn index 4f992cf7c558558e9073421bf1261e94a886a541..fb98a8da778f1cfb3192fa9ff74144695b4a3a7d 100644 --- a/Regression_test_project/src/metrics/TM_CyclomaticComplexity/TM_CyclomaticComplexity.ttcn +++ b/Regression_test_project/src/metrics/TM_CyclomaticComplexity/TM_CyclomaticComplexity.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/TM_InEnvy/TM_InEnvy.ttcn b/Regression_test_project/src/metrics/TM_InEnvy/TM_InEnvy.ttcn index 98188161f0cac360932ce32fcf9759d45fa2c009..0eb31f3b4a560424b050e590243a3ec090f0ead4 100644 --- a/Regression_test_project/src/metrics/TM_InEnvy/TM_InEnvy.ttcn +++ b/Regression_test_project/src/metrics/TM_InEnvy/TM_InEnvy.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/TM_LinesOfCode/TM_LinesOfCode.ttcn b/Regression_test_project/src/metrics/TM_LinesOfCode/TM_LinesOfCode.ttcn index 28fad5ab4162746c5188c6a97dc1015e6c8da5d8..ea71e2b02ae6dcfc8d56385bd91da963caf2a6c4 100644 --- a/Regression_test_project/src/metrics/TM_LinesOfCode/TM_LinesOfCode.ttcn +++ b/Regression_test_project/src/metrics/TM_LinesOfCode/TM_LinesOfCode.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/TM_Nesting/TM_Nesting.ttcn b/Regression_test_project/src/metrics/TM_Nesting/TM_Nesting.ttcn index 2549441e80b33b335a0daac335f8a7384163c136..5d1cdd54c72c9a7b0450d562a64a4902f3c9dc73 100644 --- a/Regression_test_project/src/metrics/TM_Nesting/TM_Nesting.ttcn +++ b/Regression_test_project/src/metrics/TM_Nesting/TM_Nesting.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/TM_NumberOfParams/TM_NumberOfParams.ttcn b/Regression_test_project/src/metrics/TM_NumberOfParams/TM_NumberOfParams.ttcn index 57b0c2f7baffb9a7b0fc61daa0d48181dfc5bc82..6b6202609f55b0afe0095544d59e931c2582bf8e 100644 --- a/Regression_test_project/src/metrics/TM_NumberOfParams/TM_NumberOfParams.ttcn +++ b/Regression_test_project/src/metrics/TM_NumberOfParams/TM_NumberOfParams.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Regression_test_project/src/metrics/TM_OutEnvy/TM_OutEnvy.ttcn b/Regression_test_project/src/metrics/TM_OutEnvy/TM_OutEnvy.ttcn index 12abc12c6301dfed8793191f66cf3237d3a519d9..00128af2f01dd15d0f6083c6abfa8474a52252be 100644 --- a/Regression_test_project/src/metrics/TM_OutEnvy/TM_OutEnvy.ttcn +++ b/Regression_test_project/src/metrics/TM_OutEnvy/TM_OutEnvy.ttcn @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/Semantic_Analizer_Tests/Semantic_Analizer_Tests.iml b/Semantic_Analizer_Tests/Semantic_Analizer_Tests.iml index c61108a0cc22508440e577234abfe6def8cccfb7..a3ad0437df739bb2d99d5dcd39c6389a957305db 100644 --- a/Semantic_Analizer_Tests/Semantic_Analizer_Tests.iml +++ b/Semantic_Analizer_Tests/Semantic_Analizer_Tests.iml @@ -1,6 +1,6 @@ - + diff --git a/automatic_build/build_import.xml b/automatic_build/build_import.xml index 8b762b8153b37a8c8a791c1dbd513de433ced99d..806d188d0795b20edddb9752f83400ddca91e982 100644 --- a/automatic_build/build_import.xml +++ b/automatic_build/build_import.xml @@ -1,6 +1,6 @@ diff --git a/automatic_build/build_org.eclipse.titan.debug.xml b/automatic_build/build_org.eclipse.titan.debug.xml index 11c36b87256734a188a8f1f17de676ad45329bf4..f7fac46a09ec770eaef665a5eaa75231942f3d4d 100644 --- a/automatic_build/build_org.eclipse.titan.debug.xml +++ b/automatic_build/build_org.eclipse.titan.debug.xml @@ -1,6 +1,6 @@ @@ -108,8 +108,8 @@ - - + + @@ -133,12 +133,12 @@ - - - - - - + + + + + + @@ -162,8 +162,8 @@ - - + + diff --git a/automatic_build/build_org.eclipse.titan.executor.xml b/automatic_build/build_org.eclipse.titan.executor.xml index 6baa77e191584ea74b431aa0bb1d2dab033b6c55..4d5f2a00479062b53802e2a729f3829dda09ad41 100644 --- a/automatic_build/build_org.eclipse.titan.executor.xml +++ b/automatic_build/build_org.eclipse.titan.executor.xml @@ -1,6 +1,6 @@ - + @@ -666,6 +666,11 @@ class="org.eclipse.titan.designer.preferences.pages.DebugPreferencePage" name="Debug" category="org.eclipse.titan.designer.preferences.pages.TITANPreferencePage"/> + @@ -1203,22 +1208,22 @@ contextId="org.eclipse.titan.designer.editors.TTCN3EditorScope" schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" sequence="CTRL+F4"/> - - - - mParameters; + /** * Instance counters: for each target module a separate counter is * maintained to get deterministic instance numbers in case of @@ -48,7 +62,8 @@ public abstract class Ass_pard implements IIdentifierContainer, IVisitableNode { * */ private static final Set INSTANCED_PARAMETERIZED_ASSIGNMENTS = new HashSet(); - protected Ass_pard() { + public Ass_pard(final Block aParameterListV4) { + this.mParameterList = aParameterListV4; } /** @@ -90,6 +105,24 @@ public abstract class Ass_pard implements IIdentifierContainer, IVisitableNode { INSTANCED_PARAMETERIZED_ASSIGNMENTS.clear(); } + /** + * Returns the list of formal parameter helpers. + * + * @param timestamp + * the timestamp of the actual semantic check cycle. + * + * @return the list of formal parameter helpers. + * */ + public List getFormalParameters(final CompilationTimeStamp timestamp) { + check(timestamp); + + if (null == mParameters) { + return new ArrayList(); + } + + return mParameters; + } + /** * Pre-process the block of formal parameters into a list. This list * together with actual parameters can be used to identify the @@ -98,7 +131,41 @@ public abstract class Ass_pard implements IIdentifierContainer, IVisitableNode { * @param timestamp * the timestamp of the actual semantic check cycle. * */ - public abstract void check(final CompilationTimeStamp timestamp); + public void check(final CompilationTimeStamp timestamp) { + if (null != lastTimeChecked && (!isErroneous || !lastTimeChecked.isLess(timestamp))) { + return; + } + + lastTimeChecked = timestamp; + isErroneous = false; + + if (null == mParameterList) { + isErroneous = true; + return; + } + + if (null != mParameters) { + return; + } + + final Asn1Parser parser = BlockLevelTokenStreamTracker.getASN1ParserForBlock(mParameterList); + mParameters = parser.pr_special_FormalParameterList().parameters; + List errors = parser.getErrorStorage(); + if (null != errors && !errors.isEmpty()) { + mParameters = null; + + for (int i = 0; i < errors.size(); i++) { + ParserMarkerSupport.createOnTheFlyMixedMarker((IFile) mParameterList.getLocation().getFile(), errors.get(i), + IMarker.SEVERITY_ERROR); + } + } + + if (null == mParameters) { + isErroneous = true; + } else { + mParameters.trimToSize(); + } + } @Override public void findReferences(final ReferenceFinder referenceFinder, final List foundIdentifiers) { diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Ass_pard_V4.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Ass_pard_V4.java deleted file mode 100644 index 8b4e5629043ecc10b903684772fae2ca0f7276ab..0000000000000000000000000000000000000000 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Ass_pard_V4.java +++ /dev/null @@ -1,95 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - ******************************************************************************/ -package org.eclipse.titan.designer.AST.ASN1; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IMarker; -import org.eclipse.titan.common.parsers.SyntacticErrorStorage; -import org.eclipse.titan.designer.AST.ASN1.BlockV4; -import org.eclipse.titan.designer.parsers.ParserMarkerSupport_V4; -import org.eclipse.titan.designer.parsers.asn1parser.BlockLevelTokenStreamTrackerV4; -import org.eclipse.titan.designer.parsers.asn1parser.FormalParameter_Helper_V4; -import org.eclipse.titan.designer.parsers.CompilationTimeStamp; -import org.eclipse.titan.designer.parsers.asn1parser.ASN1Parser2; - -/** - * Parameterized assignment. - * ANTLR 4 version - * - * @author Kristof Szabados - * @author Arpad Lovassy - */ -public final class Ass_pard_V4 extends Ass_pard { - /** parameter list. */ - private final BlockV4 mParameterListV4; - - /** The list of pre-processed formal parameters. */ - private ArrayList mParametersV4; - - public Ass_pard_V4(final BlockV4 aParameterListV4) { - this.mParameterListV4 = aParameterListV4; - } - - @Override - public void check(final CompilationTimeStamp timestamp) { - if (null != lastTimeChecked && (!isErroneous || !lastTimeChecked.isLess(timestamp))) { - return; - } - - lastTimeChecked = timestamp; - isErroneous = false; - - if (null == mParameterListV4) { - isErroneous = true; - return; - } - - if (null != mParametersV4) { - return; - } - - final ASN1Parser2 parser = BlockLevelTokenStreamTrackerV4.getASN1ParserForBlock(mParameterListV4); - mParametersV4 = parser.pr_special_FormalParameterList().parameters; - List errors = parser.getErrorStorage(); - if (null != errors && !errors.isEmpty()) { - mParametersV4 = null; - - for (int i = 0; i < errors.size(); i++) { - ParserMarkerSupport_V4.createOnTheFlyMixedMarker((IFile) mParameterListV4.getLocation().getFile(), errors.get(i), - IMarker.SEVERITY_ERROR); - } - } - - if (null == mParametersV4) { - isErroneous = true; - } else { - mParametersV4.trimToSize(); - } - } - - /** - * Returns the list of formal parameter helpers. - * - * @param timestamp - * the timestamp of the actual semantic check cycle. - * - * @return the list of formal parameter helpers. - * */ - public List getFormalParameters(final CompilationTimeStamp timestamp) { - check(timestamp); - - if (null == mParametersV4) { - return new ArrayList(); - } - - return mParametersV4; - } -} diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Block.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Block.java index 9d078a4327b07794e87eb824d534bce9db738dd9..4bdb33756b7893da15912887ebabe15841ffdd7c 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Block.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Block.java @@ -1,11 +1,28 @@ +/****************************************************************************** + * Copyright (c) 2000-2015 Ericsson Telecom AB + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + ******************************************************************************/ package org.eclipse.titan.designer.AST.ASN1; import java.lang.ref.WeakReference; +import java.util.List; +import org.antlr.v4.runtime.CharStream; +import org.antlr.v4.runtime.IntStream; +import org.antlr.v4.runtime.Token; +import org.antlr.v4.runtime.TokenFactory; +import org.antlr.v4.runtime.TokenSource; +import org.eclipse.core.resources.IFile; import org.eclipse.titan.designer.AST.ASTVisitor; import org.eclipse.titan.designer.AST.INamedNode; import org.eclipse.titan.designer.AST.IVisitableNode; import org.eclipse.titan.designer.AST.Location; +import org.eclipse.titan.designer.AST.NULL_Location; +import org.eclipse.titan.designer.parsers.asn1parser.Asn1Lexer; +import org.eclipse.titan.designer.parsers.asn1parser.TokenWithIndexAndSubTokens; /** * Represents a block of tokens. @@ -17,7 +34,7 @@ import org.eclipse.titan.designer.AST.Location; * @author Kristof Szabados * @author Arpad Lovassy */ -public abstract class Block implements INamedNode, IVisitableNode { +public final class Block implements INamedNode, IVisitableNode, Token, TokenSource { /** the naming parent of the block. */ //private WeakReference nameParent; @@ -30,13 +47,36 @@ public abstract class Block implements INamedNode, IVisitableNode { /** the naming parent of the block. */ private WeakReference mNameParent; - public Block() { - } + /** + * The list of the tokens contained inside the actual block. There might + * be sub-blocks in this list, but it does not contain its own '{' '}' + * enclosing tokens + * */ + private List tokenList; + + private int index = 0; - public Block( final Location aLocation ) { + private Block( final Location aLocation ) { this.mLocation = aLocation; } + public Block(List tokenList, final Location location) { + this( location ); + this.tokenList = tokenList; + } + + public Block(final Token token) { + if (token instanceof TokenWithIndexAndSubTokens) { + tokenList = ((TokenWithIndexAndSubTokens) token).getSubTokens(); + final IFile sourceFile = ((TokenWithIndexAndSubTokens) token).getSourceFile(); + setLocation( new Location(sourceFile, token.getLine(), token.getStartIndex(), token.getStopIndex()) ); + } + else { + setLocation( NULL_Location.INSTANCE ); + tokenList = ((TokenWithIndexAndSubTokens) token).getSubTokens(); + } + } + /** @return the location of the block */ public Location getLocation() { return mLocation; @@ -88,6 +128,89 @@ public abstract class Block implements INamedNode, IVisitableNode { return true; } - abstract public int getTokenListSize(); + public int getTokenListSize() { + return tokenList.size(); + } + + public List getTokenList() { + return tokenList; + } + + @Override + public int getCharPositionInLine() { + return tokenList.get(0).getCharPositionInLine(); + } + + @Override + public CharStream getInputStream() { + assert(false); + return null; + } + + @Override + public int getLine() { + return tokenList.get(0).getLine(); + } + + @Override + public int getChannel() { + return Token.DEFAULT_CHANNEL; + } + + @Override + public int getStartIndex() { + return tokenList.get(0).getStartIndex(); + } + + @Override + public int getStopIndex() { + return tokenList.get(tokenList.size() - 1).getStopIndex(); + } + + @Override + public String getText() { + StringBuilder text = new StringBuilder(); + for (Token t : tokenList) { + text.append(t.getText()); + } + return text.toString(); + } + + @Override + public int getTokenIndex() { + assert(false); + return -1; + } + @Override + public TokenSource getTokenSource() { + assert(false); + return null; + } + + @Override + public int getType() { + return Asn1Lexer.BLOCK; + } + + @Override + public String getSourceName() { + return IntStream.UNKNOWN_SOURCE_NAME; + } + + @Override + public TokenFactory getTokenFactory() { + // TODO Auto-generated method stub + return null; + } + + @Override + public Token nextToken() { + return tokenList.get(index++); + } + + @Override + public void setTokenFactory(TokenFactory arg0) { + assert(false); + } } diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/BlockV4.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/BlockV4.java deleted file mode 100644 index 36487fc26a22b20b27e718a772ddeb558c3c5296..0000000000000000000000000000000000000000 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/BlockV4.java +++ /dev/null @@ -1,147 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - ******************************************************************************/ -package org.eclipse.titan.designer.AST.ASN1; -import java.util.List; - -import org.antlr.v4.runtime.CharStream; -import org.antlr.v4.runtime.IntStream; -import org.antlr.v4.runtime.Token; -import org.antlr.v4.runtime.TokenFactory; -import org.antlr.v4.runtime.TokenSource; -import org.eclipse.core.resources.IFile; -import org.eclipse.titan.designer.AST.Location; -import org.eclipse.titan.designer.AST.NULL_Location; -import org.eclipse.titan.designer.AST.ASN1.Block; -import org.eclipse.titan.designer.parsers.asn1parser.ASN1Lexer2; -import org.eclipse.titan.designer.parsers.asn1parser.TokenWithIndexAndSubTokensV4; - - -/** - * Represents a block of tokens. - *

- * In ASN.1 most of the tokens inside blocks can not be analyzed directly in - * parse time. For this reason we are collecting them in such blocks, and when - * the semantics are, these blocks are processed. - * ANTLR 4 version - * - * @author Kristof Szabados - * @author Arpad Lovassy - */ -public class BlockV4 extends Block implements Token, TokenSource { - /** - * The list of the tokens contained inside the actual block. There might - * be sub-blocks in this list, but it does not contain its own '{' '}' - * enclosing tokens - * */ - private final List tokenList; - private int index = 0; - - public BlockV4(List tokenList, final Location location) { - super( location ); - this.tokenList = tokenList; - } - - public BlockV4(final Token token) { - if (token instanceof TokenWithIndexAndSubTokensV4) { - tokenList = ((TokenWithIndexAndSubTokensV4) token).getSubTokens(); - final IFile sourceFile = ((TokenWithIndexAndSubTokensV4) token).getSourceFile(); - setLocation( new Location(sourceFile, token.getLine(), token.getStartIndex(), token.getStopIndex()) ); - } - else { - setLocation( NULL_Location.INSTANCE ); - tokenList = ((TokenWithIndexAndSubTokensV4) token).getSubTokens(); - } - } - - public List getTokenList() { - return tokenList; - } - - @Override - public int getCharPositionInLine() { - return tokenList.get(0).getCharPositionInLine(); - } - - @Override - public CharStream getInputStream() { - assert(false); - return null; - } - - @Override - public int getLine() { - return tokenList.get(0).getLine(); - } - - @Override - public int getChannel() { - return Token.DEFAULT_CHANNEL; - } - - @Override - public int getStartIndex() { - return tokenList.get(0).getStartIndex(); - } - - @Override - public int getStopIndex() { - return tokenList.get(tokenList.size() - 1).getStopIndex(); - } - - @Override - public String getText() { - StringBuilder text = new StringBuilder(); - for (Token t : tokenList) { - text.append(t.getText()); - } - return text.toString(); - } - - @Override - public int getTokenIndex() { - assert(false); - return -1; - } - - @Override - public TokenSource getTokenSource() { - assert(false); - return null; - } - - @Override - public int getType() { - return ASN1Lexer2.BLOCK; - } - - @Override - public String getSourceName() { - return IntStream.UNKNOWN_SOURCE_NAME; - } - - @Override - public TokenFactory getTokenFactory() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Token nextToken() { - return tokenList.get(index++); - } - - @Override - public void setTokenFactory(TokenFactory arg0) { - assert(false); - } - - @Override - public int getTokenListSize() { - return tokenList.size(); - } -} diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Defined_Reference.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Defined_Reference.java index 09e33673a961eab2997d4b613db6b266095493d7..35fbffa99908793ac1f32b87588341db9678c1a6 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Defined_Reference.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Defined_Reference.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/IASN1Type.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/IASN1Type.java index f7959b9ea0ba13f126f03e607de051aff4a51297..4d42e57164fe75822b73d8053141bac1dadb8ae8 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/IASN1Type.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/IASN1Type.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/IObjectSet_Element.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/IObjectSet_Element.java index bf96a29fa3c34db2a4dab294842e631f7986ecb2..39183e03f21359a099301939c46fe6602fae6c1f 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/IObjectSet_Element.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/IObjectSet_Element.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/InformationFromObj.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/InformationFromObj.java index 1d376b213886bf405ca8e827d4224d9dafa5d575..fce4a7f6a4070f701bb3f11d138111868ff1fb33 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/InformationFromObj.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/InformationFromObj.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -39,7 +39,7 @@ import org.eclipse.titan.designer.parsers.CompilationTimeStamp; * @author Kristof Szabados * @author Arpad Lovassy */ -public abstract class InformationFromObj extends Reference { +public final class InformationFromObj extends Reference { private static final String FULLNAMEPART = "."; public static final String INVALIDREFERENCE = "Invalid reference `{0}'' (ObjectClass, ObjectSet or Object reference was expected)"; @@ -79,6 +79,10 @@ public abstract class InformationFromObj extends Reference { } } + public InformationFromObj newInstance() { + return new InformationFromObj(reference, fieldName.newInstance()); + } + @Override public void setLocation(final Location location) { this.location = location; @@ -440,10 +444,14 @@ public abstract class InformationFromObj extends Reference { /** * @return ObjectSet_definition */ - protected abstract ObjectSet_definition newObjectSetDefinitionInstance(); + protected ObjectSet_definition newObjectSetDefinitionInstance() { + return new ObjectSet_definition(); + } /** * @return ObjectSet_definition */ - protected abstract ObjectSet_definition newObjectSetDefinitionInstance( final ASN1Objects aObjects ); + protected ObjectSet_definition newObjectSetDefinitionInstance( ASN1Objects aObjects ) { + return new ObjectSet_definition( aObjects ); + } } diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/InformationFromObj_V4.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/InformationFromObj_V4.java deleted file mode 100644 index 782b7cf501e15f6448b2d56234f038b89fe27ce2..0000000000000000000000000000000000000000 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/InformationFromObj_V4.java +++ /dev/null @@ -1,44 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - ******************************************************************************/ -package org.eclipse.titan.designer.AST.ASN1; - -import org.eclipse.titan.designer.AST.ASN1.Defined_Reference; -import org.eclipse.titan.designer.AST.ASN1.InformationFromObj; -import org.eclipse.titan.designer.AST.ASN1.Object.ASN1Objects; -import org.eclipse.titan.designer.AST.ASN1.Object.FieldName; -import org.eclipse.titan.designer.AST.ASN1.Object.ObjectSet_definition; -import org.eclipse.titan.designer.AST.ASN1.Object.ObjectSet_definition_V4; - -/** - * Class to represent InformationFromObjects. - * ANTLR 4 version - * - * @author Kristof Szabados - * @author Arpad Lovassy - */ -public final class InformationFromObj_V4 extends InformationFromObj { - - public InformationFromObj_V4(final Defined_Reference reference, final FieldName fieldName) { - super(reference, fieldName); - } - - @Override - public InformationFromObj newInstance() { - return new InformationFromObj_V4(reference, fieldName.newInstance()); - } - - @Override - protected ObjectSet_definition newObjectSetDefinitionInstance() { - return new ObjectSet_definition_V4(); - } - - @Override - protected ObjectSet_definition newObjectSetDefinitionInstance( ASN1Objects aObjects ) { - return new ObjectSet_definition_V4( aObjects ); - } -} diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ASN1Objects.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ASN1Objects.java index dc9f1f2b01efaca1ad38f600e6ed67a27647df95..05b3f84a4519c84b89f80f287fec8b0e5f2e7652 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ASN1Objects.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ASN1Objects.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/Erroneous_FieldSpecification.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/Erroneous_FieldSpecification.java index 44eec04f79b7b6522d7eddabfa50000c75ad14e6..46617b279752dbd3499590a2d7faef7a1c1859c9 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/Erroneous_FieldSpecification.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/Erroneous_FieldSpecification.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldName.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldName.java index 3ee53897a3cbeddfc114226e122341867f4ad4c3..d74f1c12fb5506ab355c372b4a2c41c97d8c51bc 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldName.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldName.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldSetting.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldSetting.java index ce3d503b3c134aceff5207f2d763a5e282a0193b..fc73d8b71430561b7f6cd4b1bf65733dba7bbd4a 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldSetting.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldSetting.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldSetting_Object.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldSetting_Object.java index c0a7cfb41ee89401176ba4a4d11623192b1f4ec9..308b820c1a4fe3f54f8711cb82cab4f66e99386d 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldSetting_Object.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldSetting_Object.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldSetting_ObjectSet.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldSetting_ObjectSet.java index c3e382eb32474970a706083f52e1ab6b2a759c30..e278f3f7df1e7bb30e120446ffa4cdec484b6633 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldSetting_ObjectSet.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldSetting_ObjectSet.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -15,7 +15,6 @@ import org.eclipse.titan.designer.AST.ASN1.Object.FieldSpecification.Fieldspecif import org.eclipse.titan.designer.editors.DeclarationCollector; import org.eclipse.titan.designer.editors.ProposalCollector; import org.eclipse.titan.designer.parsers.CompilationTimeStamp; -import org.eclipse.titan.designer.parsers.ParserFactory; /** * Class to represent ObjectSet FieldSettings. @@ -55,7 +54,7 @@ public final class FieldSetting_ObjectSet extends FieldSetting { if (!Fieldspecification_types.FS_OS.equals(fieldSpecification.getFieldSpecificationType())) { location.reportSemanticError(OBJECTSETEXPECTED); - objectSet = ParserFactory.createObjectSetDefinition(); + objectSet = new ObjectSet_definition(); objectSet.setFullNameParent(this); objectSet.setLocation(fieldSpecification.getLocation()); } diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldSetting_Type.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldSetting_Type.java index a47365e9d41368a659bbe05da190f81b10f26af6..2ca60ad13638a49a75dcb3f0a260490f158aada1 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldSetting_Type.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldSetting_Type.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldSetting_Value.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldSetting_Value.java index 24dc8af169e36f9da55fe1d2a394792757359434..9bf045d343fc2d6fc8f516698261ff6510e34a2a 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldSetting_Value.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldSetting_Value.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldSpecification.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldSpecification.java index fc3e213f4f6721e672054c4df553e100b6e46181..d0f3fb85ffa69e40590275f352cded6c97073cce 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldSpecification.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldSpecification.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldSpecifications.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldSpecifications.java index 7d9ce22720148528c1fb020dfee33926d4c29073..077bfed345201768ac34e0de0acc5119acaf506f 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldSpecifications.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FieldSpecifications.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FixedTypeValue_FieldSpecification.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FixedTypeValue_FieldSpecification.java index 8a7acc4f721eab0c3e977dcca41a5da029a0865e..67850b628078a86837e2cf5bb1c591803c42173b 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FixedTypeValue_FieldSpecification.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/FixedTypeValue_FieldSpecification.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_Builder.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_Builder.java index d20a0ced71398c4a89c28c621e4392f631858da0..a9291d6e40aec49a5307a512b9dc011fdaacf563 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_Builder.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_Builder.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,9 +7,21 @@ ******************************************************************************/ package org.eclipse.titan.designer.AST.ASN1.Object; +import java.util.ArrayList; +import java.util.List; + +import org.antlr.v4.runtime.Token; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IMarker; +import org.eclipse.titan.common.parsers.SyntacticErrorStorage; import org.eclipse.titan.designer.AST.Identifier; import org.eclipse.titan.designer.AST.ASN1.Block; import org.eclipse.titan.designer.AST.ASN1.Object.ObjectClassSyntax_setting.SyntaxSetting_types; +import org.eclipse.titan.designer.parsers.ParserMarkerSupport; +import org.eclipse.titan.designer.parsers.asn1parser.Asn1Lexer; +import org.eclipse.titan.designer.parsers.asn1parser.Asn1Parser; +import org.eclipse.titan.designer.parsers.asn1parser.SyntaxLevelTokenStreamTracker; +import org.eclipse.titan.designer.parsers.asn1parser.TokenWithIndexAndSubTokens; /** * OCS visitor to build the OCS. :) It's clear and simple, isn't it? @@ -17,7 +29,7 @@ import org.eclipse.titan.designer.AST.ASN1.Object.ObjectClassSyntax_setting.Synt * @author Kristof Szabados * @author Arpad Lovassy */ -public abstract class ObjectClassSyntax_Builder extends ObjectClassSyntax_Visitor { +public final class ObjectClassSyntax_Builder extends ObjectClassSyntax_Visitor { protected Block mBlock; protected final FieldSpecifications fieldSpecifications; @@ -25,6 +37,31 @@ public abstract class ObjectClassSyntax_Builder extends ObjectClassSyntax_Visito public ObjectClassSyntax_Builder(final Block aBlock, final FieldSpecifications aFieldSpecifications) { this.mBlock = aBlock; this.fieldSpecifications = aFieldSpecifications; + if ( aBlock != null ) { + final List internalTokens = new ArrayList(aBlock.getTokenList().size()); + Token token; + + for (int i = 0; i < aBlock.getTokenList().size(); i++) { + token = aBlock.getTokenList().get(i); + + if (token.getType() == Asn1Lexer.LEFTVERSIONBRACKETS) { + org.antlr.v4.runtime.CommonToken token2 = ((TokenWithIndexAndSubTokens) token).copy(); + token2.setType(Asn1Lexer.SQUAREOPEN); + internalTokens.add(token2); + internalTokens.add(token2); + } else if (token.getType() == Asn1Lexer.RIGHTVERSIONBRACKETS) { + org.antlr.v4.runtime.CommonToken token2 = ((TokenWithIndexAndSubTokens) token).copy(); + token2.setType(Asn1Lexer.SQUARECLOSE); + internalTokens.add(token2); + internalTokens.add(token2); + } else { + internalTokens.add(token); + } + } + internalTokens.add(new TokenWithIndexAndSubTokens(Token.EOF)); + + this.mBlock = new Block(internalTokens, aBlock.getLocation()); + } } @Override @@ -97,6 +134,35 @@ public abstract class ObjectClassSyntax_Builder extends ObjectClassSyntax_Visito parameter.setIsBuilded(true); } + public void visitSequence(final ObjectClassSyntax_sequence parameter) { + if (parameter.getIsBuilded()) { + return; + } + + final Asn1Parser parser = SyntaxLevelTokenStreamTracker.getASN1ParserForBlock(mBlock); + if (null == parser) { + return; + } + final List nodes = parser.pr_special_ObjectClassSyntax_Builder(fieldSpecifications).nodes; + if (null != nodes) { + for (ObjectClassSyntax_Node node : nodes) { + parameter.addNode(node); + } + } + List errors = parser.getErrorStorage(); + if (null != errors && !errors.isEmpty()) { + for (int i = 0; i < errors.size(); i++) { + ParserMarkerSupport.createOnTheFlyMixedMarker((IFile) mBlock.getLocation().getFile(), errors.get(i), + IMarker.SEVERITY_ERROR); + } + } else if (parameter.getIsOptional() && 0 == parameter.getNofNodes()) { + parameter.getLocation().reportSemanticError("Empty optional group is not allowed"); + } + + parameter.setIsBuilded(true); + parameter.trimToSize(); + } + @Override public void visitLiteral(final ObjectClassSyntax_literal parameter) { // FATAL ERROR diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_Builder_V4.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_Builder_V4.java deleted file mode 100644 index d76f9b72c3b765ee823085de5898bd3606f9666d..0000000000000000000000000000000000000000 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_Builder_V4.java +++ /dev/null @@ -1,92 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - ******************************************************************************/ -package org.eclipse.titan.designer.AST.ASN1.Object; - -import java.util.ArrayList; -import java.util.List; - -import org.antlr.v4.runtime.Token; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IMarker; -import org.eclipse.titan.common.parsers.SyntacticErrorStorage; -import org.eclipse.titan.designer.AST.ASN1.BlockV4; -import org.eclipse.titan.designer.parsers.ParserMarkerSupport_V4; -import org.eclipse.titan.designer.parsers.asn1parser.ASN1Lexer2; -import org.eclipse.titan.designer.parsers.asn1parser.ASN1Parser2; -import org.eclipse.titan.designer.parsers.asn1parser.SyntaxLevelTokenStreamTrackerV4; -import org.eclipse.titan.designer.parsers.asn1parser.TokenWithIndexAndSubTokensV4; - -/** - * OCS visitor to build the OCS. :) It's clear and simple, isn't it? - * ANTLR 4 version - * - * @author Kristof Szabados - * @author Arpad Lovassy - */ -public final class ObjectClassSyntax_Builder_V4 extends ObjectClassSyntax_Builder { - - public ObjectClassSyntax_Builder_V4(final BlockV4 aBlockV4, final FieldSpecifications aFieldSpecifications) { - super( aBlockV4, aFieldSpecifications ); - if ( aBlockV4 != null ) { - final List internalTokens = new ArrayList(aBlockV4.getTokenList().size()); - Token token; - - for (int i = 0; i < aBlockV4.getTokenList().size(); i++) { - token = aBlockV4.getTokenList().get(i); - - if (token.getType() == ASN1Lexer2.LEFTVERSIONBRACKETS) { - org.antlr.v4.runtime.CommonToken token2 = ((TokenWithIndexAndSubTokensV4) token).copy(); - token2.setType(ASN1Lexer2.SQUAREOPEN); - internalTokens.add(token2); - internalTokens.add(token2); - } else if (token.getType() == ASN1Lexer2.RIGHTVERSIONBRACKETS) { - org.antlr.v4.runtime.CommonToken token2 = ((TokenWithIndexAndSubTokensV4) token).copy(); - token2.setType(ASN1Lexer2.SQUARECLOSE); - internalTokens.add(token2); - internalTokens.add(token2); - } else { - internalTokens.add(token); - } - } - internalTokens.add(new TokenWithIndexAndSubTokensV4(Token.EOF)); - - this.mBlock = new BlockV4(internalTokens, aBlockV4.getLocation()); - } - } - - - @Override - public void visitSequence(final ObjectClassSyntax_sequence parameter) { - if (parameter.getIsBuilded()) { - return; - } - - final ASN1Parser2 parser = SyntaxLevelTokenStreamTrackerV4.getASN1ParserForBlock((BlockV4)mBlock); - if (null == parser) { - return; - } - final List nodes = parser.pr_special_ObjectClassSyntax_Builder(fieldSpecifications).nodes; - if (null != nodes) { - for (ObjectClassSyntax_Node node : nodes) { - parameter.addNode(node); - } - } - List errors = parser.getErrorStorage(); - if (null != errors && !errors.isEmpty()) { - for (int i = 0; i < errors.size(); i++) { - ParserMarkerSupport_V4.createOnTheFlyMixedMarker((IFile) mBlock.getLocation().getFile(), errors.get(i), - IMarker.SEVERITY_ERROR); - } - } else if (parameter.getIsOptional() && 0 == parameter.getNofNodes()) { - parameter.getLocation().reportSemanticError("Empty optional group is not allowed"); - } - - parameter.setIsBuilded(true); - parameter.trimToSize(); - } -} diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_Node.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_Node.java index 061a3664cf8574057f55447f2698112efa62a3e6..0af22f15eac00228ee5b2d052002c7b6ff0ceab7 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_Node.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_Node.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_Parser.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_Parser.java index 9868faad9a8f798263c487593add235117afbb8c..5eb1a83b72d99e08e2437061851525e779e237bf 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_Parser.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_Parser.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -8,9 +8,21 @@ package org.eclipse.titan.designer.AST.ASN1.Object; +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IMarker; +import org.eclipse.titan.common.parsers.SyntacticErrorStorage; import org.eclipse.titan.designer.AST.ASN1.ASN1Object; import org.eclipse.titan.designer.AST.ASN1.ASN1Type; +import org.eclipse.titan.designer.AST.ASN1.Block; import org.eclipse.titan.designer.AST.ASN1.ObjectSet; +import org.eclipse.titan.designer.parsers.ParserMarkerSupport; +import org.eclipse.titan.designer.parsers.asn1parser.Asn1Lexer; +import org.eclipse.titan.designer.parsers.asn1parser.Asn1Parser; +import org.eclipse.titan.designer.parsers.asn1parser.BlockLevelTokenStreamTracker; +import org.eclipse.titan.designer.parsers.asn1parser.TokenWithIndexAndSubTokens; /** * OCS visitor to parse an object definition. @@ -18,8 +30,9 @@ import org.eclipse.titan.designer.AST.ASN1.ObjectSet; * @author Kristof Szabados * @author Arpad Lovassy */ -public abstract class ObjectClassSyntax_Parser extends ObjectClassSyntax_Visitor { +public final class ObjectClassSyntax_Parser extends ObjectClassSyntax_Visitor { + private final Block mBlock; protected final Object_Definition myObject; /** @@ -33,8 +46,19 @@ public abstract class ObjectClassSyntax_Parser extends ObjectClassSyntax_Visitor /** the actual index till which the tokens are already parsed. */ protected int internalIndex; - public ObjectClassSyntax_Parser(final Object_Definition myObject) { + public ObjectClassSyntax_Parser(final Block aBlock, final Object_Definition myObject) { this.myObject = myObject; + final List tempTokens = aBlock.getTokenList(); + final List temp = new ArrayList(tempTokens.size()); + for (int i = 0; i < tempTokens.size(); i++) { + temp.add(tempTokens.get(i)); + } + temp.add(new TokenWithIndexAndSubTokens(org.antlr.v4.runtime.Token.EOF)); + + this.mBlock = new Block(temp, aBlock.getLocation()); + this.mBlock.setFullNameParent(aBlock); + success = true; + internalIndex = 0; } @Override @@ -82,11 +106,206 @@ public abstract class ObjectClassSyntax_Parser extends ObjectClassSyntax_Visitor myObject.addFieldSetting(fieldSetting); } - abstract protected ASN1Type parseType(); - - abstract protected boolean parseValue(); - - abstract protected ASN1Object parseObject(); + @Override + public void visitRoot(final ObjectClassSyntax_root parameter) { + if (mBlock != null) { + if (!success || !parameter.getIsBuilded() || (mBlock.getTokenList().isEmpty())) { + // FATAL ERROR, but now OK + return; + } + } + + previousSuccess = false; + parameter.getSequence().accept(this); + if (null != mBlock) { + if (success && internalIndex < mBlock.getTokenList().size() && mBlock.getTokenList().get(internalIndex).getType() != org.antlr.v4.runtime.Token.EOF) { + success = false; + final org.antlr.v4.runtime.Token token = mBlock.getTokenList().get(internalIndex); + myObject.getLocation().reportSemanticError("Unexpected `" + token.getText() + "', it is a superfluous part"); + } + } + + if (!success) { + myObject.getLocation().reportSemanticError("Check the syntax of objectclass"); + myObject.setIsErroneous(true); + } + } + + @Override + public void visitLiteral(final ObjectClassSyntax_literal parameter) { + previousSuccess = false; + if (null != mBlock) { + if (mBlock.getTokenList().size() <= internalIndex) { + return; + } + } + + if (null != mBlock) { + final org.antlr.v4.runtime.Token token = mBlock.getTokenList().get(internalIndex); + if (null == token.getText()) { + // reached the end of the block + return; + } + if (token.getText().equals(parameter.getLiteral())) { + if (internalIndex < mBlock.getTokenList().size() - 1) { + internalIndex++; + } + previousSuccess = true; + } + } + } + + @Override + public void visitSequence(final ObjectClassSyntax_sequence parameter) { + + if (null != mBlock) { + if (mBlock.getTokenList().size() <= internalIndex) { + return; + } + } + + int i; + + if (null != mBlock) { + org.antlr.v4.runtime.Token token = mBlock.getTokenList().get(internalIndex); + if (parameter.getOptionalFirstComma() && myObject.getNofFieldSettings() > 0) { + if (token.getType() == Asn1Lexer.COMMA) { + if (internalIndex < mBlock.getTokenList().size() - 1) { + internalIndex++; + } + } else { + if (parameter.getIsOptional()) { + previousSuccess = true; + } else { + success = false; + myObject.getLocation().reportSemanticError("Unexpected `" + token.getText() + "', expecting `,'"); + } + return; + } + i = 0; + } else { + if (0 == parameter.getNofNodes()) { + return; + } + parameter.getNthNode(0).accept(this); + if (!success) { + return; + } + if (!previousSuccess) { + if (parameter.getIsOptional()) { + previousSuccess = true; + } else { + success = false; + myObject.getLocation().reportSemanticError( + "Unexpected `" + token.getText() + "', expecting `" + + parameter.getNthNode(0).getDisplayName() + "'"); + } + return; + } + i = 1; + } - abstract protected ObjectSet parseObjectSet(); + for (; i < parameter.getNofNodes(); i++) { + parameter.getNthNode(i).accept(this); + if (!previousSuccess) { + if (parameter.getIsOptional()) { + previousSuccess = true; + internalIndex--; + return; + } + success = false; + if (mBlock.getTokenList().size() <= internalIndex) { + return; + } + token = mBlock.getTokenList().get(internalIndex); + myObject.getLocation().reportSemanticError( + "Unexpected `" + token.getText() + "', expecting `" + parameter.getNthNode(i).getDisplayName() + "'"); + } + if (!success) { + return; + } + } + } + } + + private ASN1Type parseType() { + ASN1Type type = null; + if (mBlock != null) { + Asn1Parser parser = BlockLevelTokenStreamTracker.getASN1ParserForBlock(mBlock, internalIndex); + if (parser != null) { + type = parser.pr_special_Type().type; + internalIndex += parser.nof_consumed_tokens(); + List errors = parser.getErrorStorage(); + if (null != errors && !errors.isEmpty()) { + for (int i = 0; i < errors.size(); i++) { + ParserMarkerSupport.createOnTheFlyMixedMarker((IFile) mBlock.getLocation().getFile(), + errors.get(i), IMarker.SEVERITY_ERROR); + } + } + } + } + + return type; + } + + private boolean parseValue() { + if (mBlock != null) { + Asn1Parser parser = BlockLevelTokenStreamTracker.getASN1ParserForBlock(mBlock, internalIndex); + if (parser != null) { + parser.pr_special_Value(); + internalIndex += parser.nof_consumed_tokens(); + List errors = parser.getErrorStorage(); + if (null != errors && !errors.isEmpty()) { + for (int i = 0; i < errors.size(); i++) { + ParserMarkerSupport.createOnTheFlyMixedMarker((IFile) mBlock.getLocation().getFile(), errors.get(i), + IMarker.SEVERITY_ERROR); + } + } + return true; + } + return false; + } + + return false; + } + + private ASN1Object parseObject() { + ASN1Object object = null; + if (mBlock != null) { + Asn1Parser parser = BlockLevelTokenStreamTracker.getASN1ParserForBlock(mBlock, internalIndex); + if (parser != null) { + object = parser.pr_special_Object().object; + internalIndex += parser.nof_consumed_tokens(); + List errors = parser.getErrorStorage(); + if (null != errors && !errors.isEmpty()) { + for (int i = 0; i < errors.size(); i++) { + ParserMarkerSupport.createOnTheFlyMixedMarker((IFile) mBlock.getLocation().getFile(), errors.get(i), + IMarker.SEVERITY_ERROR); + } + } + } + } + + return object; + } + + private ObjectSet parseObjectSet() { + ObjectSet objectSet = null; + if (mBlock != null) { + Asn1Parser parser = BlockLevelTokenStreamTracker.getASN1ParserForBlock(mBlock, internalIndex); + if (parser != null) { + objectSet = parser.pr_special_ObjectSet().objectSet; + internalIndex += parser.nof_consumed_tokens(); + List errors = parser.getErrorStorage(); + if (null != errors && !errors.isEmpty()) { + for (int i = 0; i < errors.size(); i++) { + ParserMarkerSupport.createOnTheFlyMixedMarker((IFile) mBlock.getLocation().getFile(), errors.get(i), + IMarker.SEVERITY_ERROR); + } + } + } + } + + return objectSet; + } } diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_Parser_V4.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_Parser_V4.java deleted file mode 100644 index b7658a61cb693af95ad43e30b03fc5a134f84ae7..0000000000000000000000000000000000000000 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_Parser_V4.java +++ /dev/null @@ -1,263 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - ******************************************************************************/ -package org.eclipse.titan.designer.AST.ASN1.Object; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IMarker; -import org.eclipse.titan.common.parsers.SyntacticErrorStorage; -import org.eclipse.titan.designer.AST.ASN1.ASN1Object; -import org.eclipse.titan.designer.AST.ASN1.ASN1Type; -import org.eclipse.titan.designer.AST.ASN1.ObjectSet; -import org.eclipse.titan.designer.AST.ASN1.BlockV4; -import org.eclipse.titan.designer.AST.ASN1.Object.ObjectClassSyntax_Parser; -import org.eclipse.titan.designer.AST.ASN1.Object.ObjectClassSyntax_literal; -import org.eclipse.titan.designer.AST.ASN1.Object.ObjectClassSyntax_root; -import org.eclipse.titan.designer.AST.ASN1.Object.ObjectClassSyntax_sequence; -import org.eclipse.titan.designer.AST.ASN1.Object.Object_Definition; -import org.eclipse.titan.designer.parsers.ParserMarkerSupport_V4; -import org.eclipse.titan.designer.parsers.asn1parser.TokenWithIndexAndSubTokensV4; -import org.eclipse.titan.designer.parsers.asn1parser.ASN1Lexer2; -import org.eclipse.titan.designer.parsers.asn1parser.ASN1Parser2; -import org.eclipse.titan.designer.parsers.asn1parser.BlockLevelTokenStreamTrackerV4; - -/** - * OCS visitor to parse an object definition. - * ANTLR 4 specific - * - * @author Kristof Szabados - * @author Arpad Lovassy - */ -public final class ObjectClassSyntax_Parser_V4 extends ObjectClassSyntax_Parser { - - private final BlockV4 mBlockV4; - - public ObjectClassSyntax_Parser_V4(final BlockV4 blockV4, final Object_Definition myObject) { - super( myObject ); - final List tempTokens = blockV4.getTokenList(); - final List temp = new ArrayList(tempTokens.size()); - for (int i = 0; i < tempTokens.size(); i++) { - temp.add(tempTokens.get(i)); - } - temp.add(new TokenWithIndexAndSubTokensV4(org.antlr.v4.runtime.Token.EOF)); - - this.mBlockV4 = new BlockV4(temp, blockV4.getLocation()); - this.mBlockV4.setFullNameParent(blockV4); - success = true; - internalIndex = 0; - } - - @Override - public void visitRoot(final ObjectClassSyntax_root parameter) { - if (mBlockV4 != null) { - if (!success || !parameter.getIsBuilded() || (mBlockV4.getTokenList().isEmpty())) { - // FATAL ERROR, but now OK - return; - } - } - - previousSuccess = false; - parameter.getSequence().accept(this); - if (null != mBlockV4) { - if (success && internalIndex < mBlockV4.getTokenList().size() && mBlockV4.getTokenList().get(internalIndex).getType() != org.antlr.v4.runtime.Token.EOF) { - success = false; - final org.antlr.v4.runtime.Token token = mBlockV4.getTokenList().get(internalIndex); - myObject.getLocation().reportSemanticError("Unexpected `" + token.getText() + "', it is a superfluous part"); - } - } - - if (!success) { - myObject.getLocation().reportSemanticError("Check the syntax of objectclass"); - myObject.setIsErroneous(true); - } - } - - @Override - public void visitLiteral(final ObjectClassSyntax_literal parameter) { - previousSuccess = false; - if (null != mBlockV4) { - if (mBlockV4.getTokenList().size() <= internalIndex) { - return; - } - } - - if (null != mBlockV4) { - final org.antlr.v4.runtime.Token token = mBlockV4.getTokenList().get(internalIndex); - if (null == token.getText()) { - // reached the end of the block - return; - } - if (token.getText().equals(parameter.getLiteral())) { - if (internalIndex < mBlockV4.getTokenList().size() - 1) { - internalIndex++; - } - previousSuccess = true; - } - } - } - - @Override - public void visitSequence(final ObjectClassSyntax_sequence parameter) { - - if (null != mBlockV4) { - if (mBlockV4.getTokenList().size() <= internalIndex) { - return; - } - } - - int i; - - if (null != mBlockV4) { - org.antlr.v4.runtime.Token token = mBlockV4.getTokenList().get(internalIndex); - if (parameter.getOptionalFirstComma() && myObject.getNofFieldSettings() > 0) { - if (token.getType() == ASN1Lexer2.COMMA) { - if (internalIndex < mBlockV4.getTokenList().size() - 1) { - internalIndex++; - } - } else { - if (parameter.getIsOptional()) { - previousSuccess = true; - } else { - success = false; - myObject.getLocation().reportSemanticError("Unexpected `" + token.getText() + "', expecting `,'"); - } - return; - } - i = 0; - } else { - if (0 == parameter.getNofNodes()) { - return; - } - parameter.getNthNode(0).accept(this); - if (!success) { - return; - } - if (!previousSuccess) { - if (parameter.getIsOptional()) { - previousSuccess = true; - } else { - success = false; - myObject.getLocation().reportSemanticError( - "Unexpected `" + token.getText() + "', expecting `" - + parameter.getNthNode(0).getDisplayName() + "'"); - } - return; - } - i = 1; - } - - for (; i < parameter.getNofNodes(); i++) { - parameter.getNthNode(i).accept(this); - if (!previousSuccess) { - if (parameter.getIsOptional()) { - previousSuccess = true; - internalIndex--; - return; - } - success = false; - if (mBlockV4.getTokenList().size() <= internalIndex) { - return; - } - token = mBlockV4.getTokenList().get(internalIndex); - myObject.getLocation().reportSemanticError( - "Unexpected `" + token.getText() + "', expecting `" + parameter.getNthNode(i).getDisplayName() + "'"); - } - if (!success) { - return; - } - } - } - } - - @Override - protected ASN1Type parseType() { - ASN1Type type = null; - if (mBlockV4 != null) { - ASN1Parser2 parser = BlockLevelTokenStreamTrackerV4.getASN1ParserForBlock(mBlockV4, internalIndex); - if (parser != null) { - type = parser.pr_special_Type().type; - internalIndex += parser.nof_consumed_tokens(); - List errors = parser.getErrorStorage(); - if (null != errors && !errors.isEmpty()) { - for (int i = 0; i < errors.size(); i++) { - ParserMarkerSupport_V4.createOnTheFlyMixedMarker((IFile) mBlockV4.getLocation().getFile(), - errors.get(i), IMarker.SEVERITY_ERROR); - } - } - } - } - - return type; - } - - @Override - protected boolean parseValue() { - if (mBlockV4 != null) { - ASN1Parser2 parser = BlockLevelTokenStreamTrackerV4.getASN1ParserForBlock(mBlockV4, internalIndex); - if (parser != null) { - parser.pr_special_Value(); - internalIndex += parser.nof_consumed_tokens(); - List errors = parser.getErrorStorage(); - if (null != errors && !errors.isEmpty()) { - for (int i = 0; i < errors.size(); i++) { - ParserMarkerSupport_V4.createOnTheFlyMixedMarker((IFile) mBlockV4.getLocation().getFile(), errors.get(i), - IMarker.SEVERITY_ERROR); - } - } - return true; - } - return false; - } - - return false; - } - - @Override - protected ASN1Object parseObject() { - ASN1Object object = null; - if (mBlockV4 != null) { - ASN1Parser2 parser = BlockLevelTokenStreamTrackerV4.getASN1ParserForBlock(mBlockV4, internalIndex); - if (parser != null) { - object = parser.pr_special_Object().object; - internalIndex += parser.nof_consumed_tokens(); - List errors = parser.getErrorStorage(); - if (null != errors && !errors.isEmpty()) { - for (int i = 0; i < errors.size(); i++) { - ParserMarkerSupport_V4.createOnTheFlyMixedMarker((IFile) mBlockV4.getLocation().getFile(), errors.get(i), - IMarker.SEVERITY_ERROR); - } - } - } - } - - return object; - } - - @Override - protected ObjectSet parseObjectSet() { - ObjectSet objectSet = null; - if (mBlockV4 != null) { - ASN1Parser2 parser = BlockLevelTokenStreamTrackerV4.getASN1ParserForBlock(mBlockV4, internalIndex); - if (parser != null) { - objectSet = parser.pr_special_ObjectSet().objectSet; - internalIndex += parser.nof_consumed_tokens(); - List errors = parser.getErrorStorage(); - if (null != errors && !errors.isEmpty()) { - for (int i = 0; i < errors.size(); i++) { - ParserMarkerSupport_V4.createOnTheFlyMixedMarker((IFile) mBlockV4.getLocation().getFile(), errors.get(i), - IMarker.SEVERITY_ERROR); - } - } - } - } - - return objectSet; - } -} diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_Visitor.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_Visitor.java index 0e6d8eff9e1c04cbd2853f9edc69b221fc18535b..cd48200cbb7dab812039d4eee7c9d9d37749347d 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_Visitor.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_Visitor.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_literal.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_literal.java index 2c324e96235a8b7bf01d6ab747bebef14a28e0c2..cadf43bc936c428f9dec757baa277e34e2c597e1 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_literal.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_literal.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_root.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_root.java index 4f251f55562c2d6d4208044fc8bfcb19c8c15249..c1b3f0c9a851e38536891176869b7e2c46bcb716 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_root.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_root.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_sequence.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_sequence.java index f2abdf3891d0cfbb31b37cd592074181eb93e19d..a31b20da8aa25ac5db631608dccd9fba61c1b4b1 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_sequence.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_sequence.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_setting.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_setting.java index 9d6a9ba0578e82868de1f5f85e4fd58a07c2dfb6..d3978a024e5b716f5de3e647a9cfc5e6062e0e4d 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_setting.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClassSyntax_setting.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClass_Definition.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClass_Definition.java index 29bcc0747d1000ab25c9600f603fdeabec22d454..6326bb574e4ded5dfc3a284001fc7b329143fa0d 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClass_Definition.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClass_Definition.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,28 +10,83 @@ package org.eclipse.titan.designer.AST.ASN1.Object; import java.text.MessageFormat; import java.util.List; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IMarker; +import org.eclipse.titan.common.parsers.SyntacticErrorStorage; import org.eclipse.titan.designer.AST.ASTVisitor; import org.eclipse.titan.designer.AST.IReferenceChain; import org.eclipse.titan.designer.AST.ISubReference; import org.eclipse.titan.designer.AST.Identifier; import org.eclipse.titan.designer.AST.ASN1.ASN1Object; +import org.eclipse.titan.designer.AST.ASN1.Block; import org.eclipse.titan.designer.AST.ASN1.ObjectClass; import org.eclipse.titan.designer.AST.ISubReference.Subreference_type; import org.eclipse.titan.designer.editors.DeclarationCollector; import org.eclipse.titan.designer.editors.ProposalCollector; import org.eclipse.titan.designer.parsers.CompilationTimeStamp; +import org.eclipse.titan.designer.parsers.ParserMarkerSupport; +import org.eclipse.titan.designer.parsers.asn1parser.Asn1Parser; +import org.eclipse.titan.designer.parsers.asn1parser.BlockLevelTokenStreamTracker; /** * Class to represent ObjectClassDefinition. * * @author Kristof Szabados */ -public abstract class ObjectClass_Definition extends ObjectClass { +public final class ObjectClass_Definition extends ObjectClass { private static final String MISSINGSETTING = "Missing setting for `{0}''"; + private final Block fieldSpecsBlock; + private final Block withSyntaxBlock; + protected FieldSpecifications fieldSpecifications; protected ObjectClassSyntax_root ocsRoot; + public ObjectClass_Definition(final Block fieldSpecsBlock, final Block withSyntaxBlock) { + this.fieldSpecsBlock = fieldSpecsBlock; + this.withSyntaxBlock = withSyntaxBlock; + } + + public ObjectClass_Definition() { + this.fieldSpecsBlock = null; + this.withSyntaxBlock = null; + } + + public ObjectClass_Definition newInstance() { + return new ObjectClass_Definition(fieldSpecsBlock, withSyntaxBlock); + } + + @Override + public void check(final CompilationTimeStamp timestamp) { + if (null != lastTimeChecked && !lastTimeChecked.isLess(timestamp)) { + return; + } + + lastTimeChecked = timestamp; + isErroneous = false; + + if (null != ocsRoot) { + return; + } + + if (null == fieldSpecifications) { + parseBlockFieldSpecs(); + } + + if (getIsErroneous(timestamp) || null == fieldSpecifications) { + return; + } + + fieldSpecifications.check(timestamp); + + if (null == ocsRoot) { + ocsRoot = new ObjectClassSyntax_root(); + ObjectClassSyntax_Builder builder = null; + builder = new ObjectClassSyntax_Builder(withSyntaxBlock, fieldSpecifications); + ocsRoot.accept(builder); + } + } + @Override public void checkThisObject(final CompilationTimeStamp timestamp, final ASN1Object object) { if (null == object || isErroneous) { @@ -63,7 +118,31 @@ public abstract class ObjectClass_Definition extends ObjectClass { } } - abstract protected void parseBlockFieldSpecs(); + private void parseBlockFieldSpecs() { + Asn1Parser parser = null; + parser = BlockLevelTokenStreamTracker.getASN1ParserForBlock(fieldSpecsBlock); + if (null == parser) { + return; + } + + fieldSpecifications = parser.pr_special_FieldSpecList().fieldSpecifications; + List errors = parser.getErrorStorage(); + if (null != errors && !errors.isEmpty()) { + fieldSpecifications = null; + + for (int i = 0; i < errors.size(); i++) { + ParserMarkerSupport.createOnTheFlyMixedMarker((IFile) fieldSpecsBlock.getLocation().getFile(), errors.get(i), + IMarker.SEVERITY_ERROR); + } + } + if (null == fieldSpecifications) { + isErroneous = true; + return; + } + + fieldSpecifications.setFullNameParent(this); + fieldSpecifications.setMyObjectClass(this); + } @Override public ObjectClassSyntax_root getObjectClassSyntax(final CompilationTimeStamp timestamp) { diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClass_Definition_V4.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClass_Definition_V4.java deleted file mode 100644 index ca11bea2319f73334e1310e019f1f26cef49ecd3..0000000000000000000000000000000000000000 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClass_Definition_V4.java +++ /dev/null @@ -1,109 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - ******************************************************************************/ -package org.eclipse.titan.designer.AST.ASN1.Object; - -import java.util.List; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IMarker; -import org.eclipse.titan.common.parsers.SyntacticErrorStorage; -import org.eclipse.titan.designer.AST.ASN1.BlockV4; -import org.eclipse.titan.designer.AST.ASN1.Object.ObjectClassSyntax_Builder; -import org.eclipse.titan.designer.AST.ASN1.Object.ObjectClassSyntax_Builder_V4; -import org.eclipse.titan.designer.AST.ASN1.Object.ObjectClassSyntax_root; -import org.eclipse.titan.designer.AST.ASN1.Object.ObjectClass_Definition; -import org.eclipse.titan.designer.parsers.ParserMarkerSupport_V4; -import org.eclipse.titan.designer.parsers.CompilationTimeStamp; -import org.eclipse.titan.designer.parsers.asn1parser.ASN1Parser2; -import org.eclipse.titan.designer.parsers.asn1parser.BlockLevelTokenStreamTrackerV4; - -/** - * Class to represent ObjectClassDefinition. - * ANTLR V4 specific - * - * @author Kristof Szabados - * @author Arpad Lovassy - */ -public final class ObjectClass_Definition_V4 extends ObjectClass_Definition { - - private final BlockV4 fieldSpecsBlock; - private final BlockV4 withSyntaxBlock; - - public ObjectClass_Definition_V4(final BlockV4 fieldSpecsBlock, final BlockV4 withSyntaxBlock) { - this.fieldSpecsBlock = fieldSpecsBlock; - this.withSyntaxBlock = withSyntaxBlock; - } - - public ObjectClass_Definition_V4() { - this.fieldSpecsBlock = null; - this.withSyntaxBlock = null; - } - - @Override - public ObjectClass_Definition newInstance() { - return new ObjectClass_Definition_V4(fieldSpecsBlock, withSyntaxBlock); - } - - @Override - public void check(final CompilationTimeStamp timestamp) { - if (null != lastTimeChecked && !lastTimeChecked.isLess(timestamp)) { - return; - } - - lastTimeChecked = timestamp; - isErroneous = false; - - if (null != ocsRoot) { - return; - } - - if (null == fieldSpecifications) { - parseBlockFieldSpecs(); - } - - if (getIsErroneous(timestamp) || null == fieldSpecifications) { - return; - } - - fieldSpecifications.check(timestamp); - - if (null == ocsRoot) { - ocsRoot = new ObjectClassSyntax_root(); - ObjectClassSyntax_Builder builder = null; - builder = new ObjectClassSyntax_Builder_V4(withSyntaxBlock, fieldSpecifications); - ocsRoot.accept(builder); - } - } - - @Override - protected void parseBlockFieldSpecs() { - ASN1Parser2 parser2 = null; - parser2 = BlockLevelTokenStreamTrackerV4.getASN1ParserForBlock(fieldSpecsBlock); - if (null == parser2) { - return; - } - - fieldSpecifications = parser2.pr_special_FieldSpecList().fieldSpecifications; - List errors = parser2.getErrorStorage(); - if (null != errors && !errors.isEmpty()) { - fieldSpecifications = null; - - for (int i = 0; i < errors.size(); i++) { - ParserMarkerSupport_V4.createOnTheFlyMixedMarker((IFile) fieldSpecsBlock.getLocation().getFile(), errors.get(i), - IMarker.SEVERITY_ERROR); - } - } - if (null == fieldSpecifications) { - isErroneous = true; - return; - } - - fieldSpecifications.setFullNameParent(this); - fieldSpecifications.setMyObjectClass(this); - } -} diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClass_refd.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClass_refd.java index 4558301cfcf8acd5d39841f174563d992d827b15..c7cb9e2e9010a81dfd4e34e39a5d54d67653164b 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClass_refd.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectClass_refd.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -21,7 +21,6 @@ import org.eclipse.titan.designer.AST.ASN1.ObjectClass; import org.eclipse.titan.designer.editors.DeclarationCollector; import org.eclipse.titan.designer.editors.ProposalCollector; import org.eclipse.titan.designer.parsers.CompilationTimeStamp; -import org.eclipse.titan.designer.parsers.ParserFactory; /** * Class to represent a ReferencedObjectClass. It is a DefinedOC or OCFromObject @@ -91,14 +90,14 @@ public final class ObjectClass_refd extends ObjectClass implements IReferenceCha } private ObjectClass_Definition newObjectClassDefinitionInstance() { - return ParserFactory.createObjectClassDefinition(); + return new ObjectClass_Definition(); } @Override public ObjectClass_Definition getRefdLast(final CompilationTimeStamp timestamp, final IReferenceChain referenceChain) { final boolean newChain = null == referenceChain; IReferenceChain temporalReferenceChain; - if (null == referenceChain) { + if (newChain) { temporalReferenceChain = ReferenceChain.getInstance(IReferenceChain.CIRCULARREFERENCE, true); } else { temporalReferenceChain = referenceChain; diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectSetElementVisitor_checker.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectSetElementVisitor_checker.java index 0408e9c79ffbac3f39aa0b68334c7e0fc37c6a0a..e160e3f358d7e1c6e6b114a67c95f17ce590aa6a 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectSetElementVisitor_checker.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectSetElementVisitor_checker.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectSetElementVisitor_objectCollector.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectSetElementVisitor_objectCollector.java index 86f0641c1c62b696a291886b00162661d7e8cc49..90c39792c50228d73a417cdd74b39a3a374aeb84 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectSetElementVisitor_objectCollector.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectSetElementVisitor_objectCollector.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectSet_FieldSpecification.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectSet_FieldSpecification.java index 578db3d44ea5c09e322dbe0ebccf1bf1a4681095..e8b6d7d2387157205ed11a05f8fc15e4a291e84a 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectSet_FieldSpecification.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectSet_FieldSpecification.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectSet_definition.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectSet_definition.java index 60ad47741e36fd03015ebe1bb78e80f702b3493a..c450f00e5f53467674ae8508fb5290d9fae9efbe 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectSet_definition.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectSet_definition.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB + * Copyright (c) 2000-2015 Ericsson Telecom AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,6 +10,9 @@ package org.eclipse.titan.designer.AST.ASN1.Object; import java.util.ArrayList; import java.util.List; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IMarker; +import org.eclipse.titan.common.parsers.SyntacticErrorStorage; import org.eclipse.titan.designer.AST.ASTVisitor; import org.eclipse.titan.designer.AST.INamedNode; import org.eclipse.titan.designer.AST.IReferenceChain; @@ -19,12 +22,16 @@ import org.eclipse.titan.designer.AST.Location; import org.eclipse.titan.designer.AST.ReferenceChain; import org.eclipse.titan.designer.AST.Scope; import org.eclipse.titan.designer.AST.ASN1.ASN1Object; +import org.eclipse.titan.designer.AST.ASN1.Block; import org.eclipse.titan.designer.AST.ASN1.IObjectSet_Element; import org.eclipse.titan.designer.AST.ASN1.ObjectSet; import org.eclipse.titan.designer.AST.ISubReference.Subreference_type; import org.eclipse.titan.designer.editors.DeclarationCollector; import org.eclipse.titan.designer.editors.ProposalCollector; import org.eclipse.titan.designer.parsers.CompilationTimeStamp; +import org.eclipse.titan.designer.parsers.ParserMarkerSupport; +import org.eclipse.titan.designer.parsers.asn1parser.Asn1Parser; +import org.eclipse.titan.designer.parsers.asn1parser.BlockLevelTokenStreamTracker; /** * ObjectSet definition. @@ -32,20 +39,47 @@ import org.eclipse.titan.designer.parsers.CompilationTimeStamp; * @author Kristof Szabados * @author Arpad Lovassy */ -public abstract class ObjectSet_definition extends ObjectSet implements IReferenceChainElement { +public final class ObjectSet_definition extends ObjectSet implements IReferenceChainElement { + + private final Block mBlock; private ArrayList objectSetElements; protected ASN1Objects objects; public ObjectSet_definition() { setObjectSetElements(new ArrayList()); + mBlock = null; + } + + public ObjectSet_definition(final Block aBlock) { + setObjectSetElements(new ArrayList()); + this.mBlock = aBlock; } public ObjectSet_definition(final ASN1Objects objects) { - this(); + setObjectSetElements(new ArrayList()); + mBlock = null; this.objects = objects; } + public ObjectSet_definition newInstance() { + ObjectSet_definition temp; + if (null != mBlock) { + temp = new ObjectSet_definition(mBlock); + } else if (null != objects) { + temp = new ObjectSet_definition(objects); + } else { + temp = new ObjectSet_definition(); + } + + for (int i = 0; i < getObjectSetElements().size(); i++) { + temp.addObjectSetElement(getObjectSetElements().get(i).newOseInstance()); + } + temp.getObjectSetElements().trimToSize(); + + return temp; + } + public final ArrayList getObjectSetElements() { return objectSetElements; } @@ -104,6 +138,29 @@ public abstract class ObjectSet_definition extends ObjectSet implements IReferen } } + @Override + public void check(final CompilationTimeStamp timestamp) { + if (null != lastTimeChecked && !lastTimeChecked.isLess(timestamp)) { + return; + } + + isErroneous = false; + + if (null != mBlock) { + parseBlockObjectSetSpecifications(); + } + + final ObjectSetElementVisitor_checker checker = new ObjectSetElementVisitor_checker(timestamp, location, myGovernor); + getObjectSetElements().trimToSize(); + for (IObjectSet_Element element : getObjectSetElements()) { + element.accept(checker); + } + + lastTimeChecked = timestamp; + + createObjects(true); + } + @Override public final ObjectSet_definition getRefdLast(final CompilationTimeStamp timestamp, final IReferenceChain referenceChain) { if (1 != getObjectSetElements().size()) { @@ -117,7 +174,7 @@ public abstract class ObjectSet_definition extends ObjectSet implements IReferen final boolean newChain = null == referenceChain; IReferenceChain temporalReferenceChain; - if (null == referenceChain) { + if (newChain) { temporalReferenceChain = ReferenceChain.getInstance(IReferenceChain.CIRCULARREFERENCE, true); } else { temporalReferenceChain = referenceChain; @@ -158,7 +215,37 @@ public abstract class ObjectSet_definition extends ObjectSet implements IReferen v.visitObjectSet(this, false); } - abstract protected void parseBlockObjectSetSpecifications(); + private void parseBlockObjectSetSpecifications() { + ObjectSet_definition temporalDefinition = null; + if (mBlock != null) { + Asn1Parser parser = BlockLevelTokenStreamTracker.getASN1ParserForBlock(mBlock); + if (parser != null) { + temporalDefinition = parser.pr_special_ObjectSetSpec().definition; + //internalIndex += parser.nof_consumed_tokens(); + List errors = parser.getErrorStorage(); + if (null != errors && !errors.isEmpty()) { + for (int i = 0; i < errors.size(); i++) { + ParserMarkerSupport.createOnTheFlyMixedMarker((IFile) mBlock.getLocation().getFile(), errors.get(i), + IMarker.SEVERITY_ERROR); + } + } + } + } + + if (null == temporalDefinition) { + isErroneous = true; + return; + } + + temporalDefinition.getObjectSetElements().trimToSize(); + for (int i = 0; i < temporalDefinition.getObjectSetElements().size(); i++) { + addObjectSetElement(temporalDefinition.getObjectSetElements().get(i)); + } + temporalDefinition.setObjectSetElements(null); + getObjectSetElements().trimToSize(); + + setMyScope(getMyScope()); + } protected final void createObjects(final boolean force) { if (null != objects && !force) { diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectSet_definition_V4.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectSet_definition_V4.java deleted file mode 100644 index 1e116d46f3a9e0150ac343b4ec1772028848e0c4..0000000000000000000000000000000000000000 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/ObjectSet_definition_V4.java +++ /dev/null @@ -1,126 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2000-2014 Ericsson Telecom AB - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - ******************************************************************************/ -package org.eclipse.titan.designer.AST.ASN1.Object; - -import java.util.List; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IMarker; -import org.eclipse.titan.common.parsers.SyntacticErrorStorage; -import org.eclipse.titan.designer.AST.ASN1.BlockV4; -import org.eclipse.titan.designer.AST.ASN1.IObjectSet_Element; -import org.eclipse.titan.designer.AST.ASN1.Object.ASN1Objects; -import org.eclipse.titan.designer.AST.ASN1.Object.ObjectSetElementVisitor_checker; -import org.eclipse.titan.designer.AST.ASN1.Object.ObjectSet_definition; -import org.eclipse.titan.designer.parsers.ParserMarkerSupport_V4; -import org.eclipse.titan.designer.parsers.CompilationTimeStamp; -import org.eclipse.titan.designer.parsers.asn1parser.ASN1Parser2; -import org.eclipse.titan.designer.parsers.asn1parser.BlockLevelTokenStreamTrackerV4; - -/** - * ObjectSet definition. - * ANTLR 4 specific - * - * @author Kristof Szabados - * @author Arpad Lovassy - */ -public final class ObjectSet_definition_V4 extends ObjectSet_definition { - - private final BlockV4 mBlockV4; - - public ObjectSet_definition_V4() { - super(); - mBlockV4 = null; - } - - public ObjectSet_definition_V4(final BlockV4 aBlockV4) { - super(); - this.mBlockV4 = aBlockV4; - } - - public ObjectSet_definition_V4(final ASN1Objects objects) { - super(objects); - mBlockV4 = null; - } - - @Override - public ObjectSet_definition newInstance() { - ObjectSet_definition temp; - if (null != mBlockV4) { - temp = new ObjectSet_definition_V4(mBlockV4); - } else if (null != objects) { - temp = new ObjectSet_definition_V4(objects); - } else { - temp = new ObjectSet_definition_V4(); - } - - for (int i = 0; i < getObjectSetElements().size(); i++) { - temp.addObjectSetElement(getObjectSetElements().get(i).newOseInstance()); - } - temp.getObjectSetElements().trimToSize(); - - return temp; - } - - @Override - public void check(final CompilationTimeStamp timestamp) { - if (null != lastTimeChecked && !lastTimeChecked.isLess(timestamp)) { - return; - } - - isErroneous = false; - - if (null != mBlockV4) { - parseBlockObjectSetSpecifications(); - } - - final ObjectSetElementVisitor_checker checker = new ObjectSetElementVisitor_checker(timestamp, location, myGovernor); - getObjectSetElements().trimToSize(); - for (IObjectSet_Element element : getObjectSetElements()) { - element.accept(checker); - } - - lastTimeChecked = timestamp; - - createObjects(true); - } - - @Override - protected void parseBlockObjectSetSpecifications() { - ObjectSet_definition temporalDefinition = null; - if (mBlockV4 != null) { - ASN1Parser2 parser = BlockLevelTokenStreamTrackerV4.getASN1ParserForBlock(mBlockV4); - if (parser != null) { - temporalDefinition = parser.pr_special_ObjectSetSpec().definition; - //internalIndex += parser.nof_consumed_tokens(); - List errors = parser.getErrorStorage(); - if (null != errors && !errors.isEmpty()) { - for (int i = 0; i < errors.size(); i++) { - ParserMarkerSupport_V4.createOnTheFlyMixedMarker((IFile) mBlockV4.getLocation().getFile(), errors.get(i), - IMarker.SEVERITY_ERROR); - } - } - } - } - - if (null == temporalDefinition) { - isErroneous = true; - return; - } - - temporalDefinition.getObjectSetElements().trimToSize(); - for (int i = 0; i < temporalDefinition.getObjectSetElements().size(); i++) { - addObjectSetElement(temporalDefinition.getObjectSetElements().get(i)); - } - temporalDefinition.setObjectSetElements(null); - getObjectSetElements().trimToSize(); - - setMyScope(getMyScope()); - } - -} diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/Object_Definition.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/Object_Definition.java index cd228f44c80ce21a5acae75323275004d2e947f3..52e5a8812c797cc4379711b8f02b0d8ce309fabf 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/Object_Definition.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/Object/Object_Definition.java @@ -1,5