diff options
758 files changed, 10319 insertions, 6009 deletions
diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml new file mode 100644 index 00000000000..e95d3d50182 --- /dev/null +++ b/.github/workflows/fuzz.yml @@ -0,0 +1,22 @@ +name: fuzz + +on: + push: + pull_request: + schedule: + - cron: '0 7 * * SUN' + +jobs: + build: + runs-on: ubuntu-latest + env: + ACE_ROOT: ${{ github.workspace }}/ACE + TAO_ROOT: ${{ github.workspace }}/TAO + + steps: + - name: checkout ACE/TAO + uses: actions/checkout@v2 + - name: Run fuzz + run: | + perl ${env:ACE_ROOT}/bin/fuzz.pl + shell: pwsh diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml new file mode 100644 index 00000000000..d1bca0dcc75 --- /dev/null +++ b/.github/workflows/linux.yml @@ -0,0 +1,134 @@ +name: linux + +on: + push: + pull_request: + schedule: + - cron: '0 7 * * SUN' + +jobs: + build: + strategy: + matrix: + include: + - CC: gcc-4.8 + CXX: g++-4.8 + PackageDeps: g++-4.8 + platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU + os: ubuntu-16.04 + - CC: gcc-6 + CXX: g++-6 + PackageDeps: g++-6 + platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU + os: ubuntu-18.04 + - CC: gcc-7 + CXX: g++-7 + PackageDeps: g++-7 + platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU + os: ubuntu-18.04 + - CC: gcc-8 + CXX: g++-8 + PackageDeps: g++-8 + platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU + os: ubuntu-18.04 + - CC: gcc-9 + CXX: g++-9 + PackageDeps: g++-9 + platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU + os: ubuntu-18.04 + - CC: gcc-10 + CXX: g++-10 + PackageDeps: g++-10 + platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU + os: ubuntu-20.04 + - CC: clang-5.0 + CXX: clang++-5.0 + PackageDeps: clang-5.0 + platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU + os: ubuntu-16.04 + - CC: clang-6.0 + CXX: clang++-6.0 + PackageDeps: clang-6.0 + platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU + os: ubuntu-18.04 + - CC: clang-7 + CXX: clang++-7 + PackageDeps: clang-7 + platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU + os: ubuntu-18.04 + - CC: clang-8 + CXX: clang++-8 + PackageDeps: clang-8 + platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU + os: ubuntu-18.04 + - CC: clang-9 + CXX: clang++-9 + PackageDeps: clang-9 + Repo: llvm-toolchain-$(lsb_release -cs)-9 + platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU + os: ubuntu-18.04 + - CC: clang-10 + CXX: clang++-10 + PackageDeps: clang-10 + Repo: llvm-toolchain-$(lsb_release -cs)-10 + platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU + os: ubuntu-20.04 + runs-on: ${{ matrix.os }} + name: ${{ matrix.os }} ${{ matrix.CXX }} + env: + ACE_ROOT: ${{ github.workspace }}/ACE + TAO_ROOT: ${{ github.workspace }}/TAO + MPC_ROOT: ${{ github.workspace }}/MPC + CC: ${{ matrix.CC }} + CXX: ${{ matrix.CXX }} + steps: + - name: checkout ACE/TAO + uses: actions/checkout@v2 + - name: checkout MPC + uses: actions/checkout@v2 + with: + repository: DOCGroup/MPC + path: MPC + - name: Add Repo + run: | + wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - + sudo apt-add-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ ${{ matrix.Repo }} main" + if: matrix.Repo != '' + - name: Add packages + run: | + sudo apt-get --yes update + sudo apt-get --yes install libxerces-c-dev libssl-dev ${{ matrix.PackageDeps }} + - name: create $ACE_ROOT/ace/config.h + run: | + '#include "ace/config-linux.h"' > ${env:ACE_ROOT}/ace/config.h + shell: pwsh + - name: create $ACE_ROOT/include/makeinclude/platform_macros.GNU + run: | + 'ipv6=1' > ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU + 'xerces3=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU + 'ssl=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU + '${{ matrix.platform_file }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU + shell: pwsh + - name: create $ACE_ROOT/bin/MakeProjectCreator/config/default.features + run: | + 'ipv6=1' > ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features + 'xerces3=1' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features + 'ssl=1' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features + 'versioned_namespace=1' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features + shell: pwsh + - name: Run mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc + run: | + perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:TAO_ROOT}/TAO_ACE.mwc -workers 4 + shell: pwsh + - name: Run mwc.pl on $(ACE_ROOT)/tests/tests.mwc + run: | + perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:ACE_ROOT}/tests/tests.mwc -workers 4 + shell: pwsh + - name: Build TAO_ACE project + run: | + make -j 6 -C ${env:TAO_ROOT} + shell: pwsh + - name: Build ACE/tests project + run: | + make -j 6 -C ${env:ACE_ROOT}/tests + shell: pwsh diff --git a/.github/workflows/ccpp.yml b/.github/workflows/macosx.yml index e0c57bfce46..71f0fc92009 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/macosx.yml @@ -1,33 +1,44 @@ -name: C/C++ CI +name: macosx -on: [push, pull_request] +on: + push: + pull_request: + schedule: + - cron: '0 7 * * SUN' jobs: build: - runs-on: ubuntu-latest + strategy: + matrix: + include: + - os: macos-10.15 + platform_file: include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU + runs-on: ${{ matrix.os }} + name: ${{ matrix.os }} env: ACE_ROOT: ${{ github.workspace }}/ACE TAO_ROOT: ${{ github.workspace }}/TAO - MPC_ROOT: ${{ github.workspace }}/../MPC - + MPC_ROOT: ${{ github.workspace }}/MPC steps: - name: checkout ACE/TAO - uses: actions/checkout@v1 + uses: actions/checkout@v2 - name: checkout MPC - uses: actions/checkout@v1 + uses: actions/checkout@v2 with: repository: DOCGroup/MPC - ref: master - fetch-depth: 1 + path: MPC - name: create $ACE_ROOT/ace/config.h run: | - echo ${env:ACE_ROOT} - echo ${env:GITHUB_WORKSPACE} - '#include "ace/config-linux.h"' > ${env:ACE_ROOT}/ace/config.h + '#include "ace/config-macosx.h"' > ${env:ACE_ROOT}/ace/config.h shell: pwsh - name: create $ACE_ROOT/include/makeinclude/platform_macros.GNU run: | - 'include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU' > ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU + '${{ matrix.platform_file }}' > ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU + shell: pwsh + - name: create $ACE_ROOT/bin/MakeProjectCreator/config/default.features + run: | + 'ipv6=1' > ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features + 'versioned_namespace=1' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features shell: pwsh - name: Run mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc run: | diff --git a/.travis.yml b/.travis.yml index 6a5badede77..536f8d02bcc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,13 +9,10 @@ compiler: env: matrix: - - FUZZ=1 - CORBAEMICRO=1 ACEFORTAO=0 TAO=1 - CORBAECOMPACT=1 ACEFORTAO=0 TAO=1 - ACEFORTAO=1 TAO=1 - - ACETESTS=1 ACEFORTAO=0 ACE=1 TAO=0 - USES_WCHAR=1 TAO=1 - - VERSIONED=1 TAO=1 - ACETESTS=1 FACE=1 ACE=1 TAO=0 global: - ACE_ROOT=$TRAVIS_BUILD_DIR/ACE @@ -24,11 +21,6 @@ env: - LD_LIBRARY_PATH=$ACE_ROOT/lib:$LD_LIBRARY_PATH - COMPILER=g++-8 -matrix: - include: - - os: osx - env: COMPILER=clang++ VERSIONED=1 TAO=1 ACETESTS=1 - addons: apt: packages: @@ -59,8 +51,6 @@ before_script: - if [ "$CORBAECOMPACT" == "1" ]; then echo -e "corba_e_compact=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi - if [ "$ACEFORTAO" == "1" ]; then echo -e "ace_for_tao=1" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi - if [ "$ACEFORTAO" == "1" ]; then echo -e "ace_for_tao=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi - - if [ "$CCMLW" == "1" ]; then echo -e "ccm_lw=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi - - if [ "$CCMNOEVENT" == "1" ]; then echo -e "ccm_noevent=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi - if [ "$USES_WCHAR" == "1" ]; then echo -e "uses_wchar=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi - if [ "$VERSIONED" == "1" ]; then echo -e "versioned_namespace=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then echo -e "xerces3=1\nssl=1\n" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi @@ -83,7 +73,6 @@ before_script: - if [[ "${COMPILER}" != "" ]]; then export CXX=${COMPILER}; fi script: - - if [ "$FUZZ" == "1" ]; then exec perl $ACE_ROOT/bin/fuzz.pl; fi - perl $ACE_ROOT/bin/mwc.pl -type gnuace -workers 2 travis.mwc - make -j 6 - perl $ACE_ROOT/bin/auto_run_tests.pl -l $TAO_ROOT/bin/travis-ci.lst diff --git a/ACE/ACE-INSTALL.html b/ACE/ACE-INSTALL.html index 2cd45ae6a09..c05056712f4 100644 --- a/ACE/ACE-INSTALL.html +++ b/ACE/ACE-INSTALL.html @@ -433,7 +433,7 @@ INSTALL_PREFIX = /usr/local </li> <li>If you need to regenerate the <code>ace/Svc_Conf_y.cpp</code> file, you'll need to - get <a href="http://ftp.gnu.org/pub/gnu/bison/">GNU Bison</a>. + get <a href="https://www.gnu.org/software/bison">GNU Bison</a>. However, you should rarely, if ever, need to do this. </li> </ol> @@ -451,8 +451,8 @@ one will not clean up any old files, and trying to use the environment's "Clean" command will probably not account for all existing files.</p> <p>For using MPC and our perl based test framework we recommend -our windows users to use <a href="http://www.activestate.com/Products/ActivePerl/"> Active -State Perl.</a></p> +our windows users to use <a href="https://www.activestate.com/products/perl">Active +State Perl</a> or <a href="http://strawberryperl.com">Strawberry Perl</a></p> <ul> <li><a href="#msvc">Microsoft Visual Studio</a></li> @@ -1383,8 +1383,8 @@ A few additional Windows Notes, from Paul von Behren:<p> <code>Tornado\host\x86-win32\bin\TorVars.bat</code>. This is done implicitly within the Tornado IDE.<p> </p></li><li>To run <code>ace_ld</code>, you still need perl installed - - see <a href="http://www.activestate.com/software/default.htm">http://www.activestate.com/software/default.htm</a> - for Windows perl.<p> + see <a href="https://www.activestate.com/products/perl">ActiveState Perl</a> + or <a href="http://strawberryperl.com">Strawberry Perl</a>.<p> </p></li><li>The Tornado IDE will use a standard Makefile for project builds, but does not have a GUI interface for managing the Makefile. By default, it will use rules from Makefile in the current @@ -1496,8 +1496,8 @@ host based card.</p> </b><p>NT 4.0 workstation with 128 M RAM, 266MHz Pentium.</p> <b><p>Software Needed For Building TAO</p> -</b><p>1) Active State's ActivePerl from -<a href="http://www.activestate.com/software/default.htm">http://www.activestate.com/software/default.htm</a> +</b><p>1) <a href="https://www.activestate.com/products/perl">ActiveState Perl</a> +or <a href="http://strawberryperl.com">Strawberry Perl</a> </p> <p>2) Tornado 2.2.1 from Windriver.</p> @@ -3190,8 +3190,9 @@ quickly. </p></li><li>Please make sure that you have <a href="http://www.perl.org/"> perl</a> installed, preferably perl 5.8 or higher. Users on Win32 based platforms are recommended to use - <a href="http://www.activestate.com/Products/ActivePerl/"> Active - State Perl</a>. We use active state perl without problems. We have + <a href="https://www.activestate.com/products/perl"> Active + State Perl</a> or <a href="http://strawberryperl.com">Strawberry Perl</a>. + We use both perl versions without problems. We have ran into problems trying to use the cygwin version of perl on Win32 based platforms. <p> </p></li> diff --git a/ACE/COPYING b/ACE/COPYING index fc3685c847a..5917f76aa79 100644 --- a/ACE/COPYING +++ b/ACE/COPYING @@ -86,26 +86,26 @@ References - 1. http://www.dre.vanderbilt.edu/~schmidt/ACE.html - 2. http://www.dre.vanderbilt.edu/~schmidt/TAO.html - 3. http://www.dre.vanderbilt.edu/CIAO/ - 4. http://www.dre.vanderbilt.edu/cosmic/ - 5. http://www.dre.vanderbilt.edu/~schmidt/ - 6. http://www.dre.vanderbilt.edu/~schmidt/ACE-members.html - 7. http://www.wustl.edu/ - 8. http://www.uci.edu/ - 9. http://www.vanderbilt.edu/ - 10. mailto:doc_group@cs.wustl.edu - 11. http://www.dre.vanderbilt.edu/~schmidt/ACE-users.html - 12. http://www.dre.vanderbilt.edu/~schmidt/ACE.html - 13. http://www.dre.vanderbilt.edu/~schmidt/TAO.html - 14. http://www.dre.vanderbilt.edu/CIAO/ - 15. http://www.dre.vanderbilt.edu/~schmidt/DOC_ROOT/DAnCE/ - 16. http://www.dre.vanderbilt.edu/cosmic/ - 17. http://www.dre.vanderbilt.edu/ - 18. http://www.isis.vanderbilt.edu/ - 19. http://www.cs.wustl.edu/~schmidt/doc-center.html - 20. http://www.dre.vanderbilt.edu/~schmidt/commercial-support.html + 1. https://www.dre.vanderbilt.edu/~schmidt/ACE.html + 2. https://www.dre.vanderbilt.edu/~schmidt/TAO.html + 3. https://www.dre.vanderbilt.edu/CIAO/ + 4. https://www.dre.vanderbilt.edu/cosmic/ + 5. https://www.dre.vanderbilt.edu/~schmidt/ + 6. https://www.dre.vanderbilt.edu/~schmidt/ACE-members.html + 7. https://www.wustl.edu/ + 8. https://www.uci.edu/ + 9. https://www.vanderbilt.edu/ + 10. mailto:d.schmidt@vanderbilt.edu + 11. https://www.dre.vanderbilt.edu/~schmidt/ACE-users.html + 12. https://www.dre.vanderbilt.edu/~schmidt/ACE.html + 13. https://www.dre.vanderbilt.edu/~schmidt/TAO.html + 14. https://www.dre.vanderbilt.edu/CIAO/ + 15. https://www.dre.vanderbilt.edu/~schmidt/DOC_ROOT/DAnCE/ + 16. https://www.dre.vanderbilt.edu/cosmic/ + 17. https://www.dre.vanderbilt.edu/ + 18. https://www.isis.vanderbilt.edu/ + 19. https://www.cs.wustl.edu/~schmidt/doc-center.html + 20. https://www.dre.vanderbilt.edu/~schmidt/commercial-support.html 21. mailto:d.schmidt@vanderbilt.edu - 22. http://www.dre.vanderbilt.edu/~schmidt/ - 23. http://www.dre.vanderbilt.edu/~schmidt/ACE.html + 22. https://www.dre.vanderbilt.edu/~schmidt/ + 23. https://www.dre.vanderbilt.edu/~schmidt/ACE.html diff --git a/ACE/ChangeLogs/ACE-6_5_9 b/ACE/ChangeLogs/ACE-6_5_9 new file mode 100644 index 00000000000..a67602acea8 --- /dev/null +++ b/ACE/ChangeLogs/ACE-6_5_9 @@ -0,0 +1,689 @@ +commit ab9ecbe2287908ca2d403dd6bdde8511295b7784 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Apr 29 09:37:33 2020 +0200 + + List changes + + * ACE/NEWS: + +commit 6542591505d81e79e2d3abd9bd4f497f1adafb9a +Merge: 6bab61a7d0a 57e38a7b4a4 +Author: Son Dinh <dinhs@objectcomputing.com> +Date: Tue Apr 28 09:39:00 2020 -0500 + + Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO into basic_types_macos + +commit 57e38a7b4a4fa927a4947ffb790373b67dd09c2a +Merge: ad17ff63aff 31492dcfc3c +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Apr 28 15:52:38 2020 +0200 + + Merge pull request #1088 from DOCGroup/mitza-oci-clang-common + + platform_clang_common.GNU: redirect stderr for version checks + +commit ad17ff63affd12aa82869308875e2630972132c9 +Merge: 2e234782449 57bc0064bdf +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Apr 28 15:51:51 2020 +0200 + + Merge pull request #1093 from jwillemsen/jwi-ace-cpp20 + + When __cplusplus is equal or bigger as 202002L we define ACE_HAS_CPP20 + +commit 2e234782449d31eff4a88aaaf90ff7085558d99a +Merge: aedcae37cbf f38497c7057 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Apr 28 15:51:24 2020 +0200 + + Merge pull request #1090 from jwillemsen/jwi-cdrbaselonglong-cleanup + + Map ACE_CDR LongLong to ACE_INT64, all platforms for which we needed … + +commit 57bc0064bdf8458b5a4b3dda8ff899fbcfb919c4 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Apr 28 14:06:56 2020 +0200 + + Compare cplusplus >= to make it easier to determine what is done, no need to check for g++/clang specific releases + + * ACE/ace/config-g++-common.h: + +commit c16e81913032c5584794bae9c075541a2fffbb48 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Apr 28 13:57:42 2020 +0200 + + When __cplusplus is bigger as 201703L we ste ACE_HAS_CPP20 + + * ACE/ace/config-g++-common.h: + +commit 4987d578ff1fd00b729ade914bb096ac1e33f62c +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Apr 28 10:18:58 2020 +0200 + + Fixed typo + + * ACE/ace/CDR_Base.h: + +commit f38497c70571c75675ef35ba8b48af5b5ba81d1c +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Apr 28 09:45:17 2020 +0200 + + Mention that ACE_HAS_*_T take preference + + * ACE/ace/README: + +commit b2b745cda8c72ba4b323aa4831cfe7c0c493e400 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sun Apr 26 10:12:58 2020 +0200 + + Make use of cstdint types when they are available + + * ACE/ace/Basic_Types.h: + +commit c4f4af8bff18366ed85cdb080ea801e2999d9f7c +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Apr 25 10:52:11 2020 +0200 + + Cleanup some last leftovers from old and deprecated tandem support + + * ACE/ace/ACE_export.h: + * ACE/ace/Basic_Types.h: + * ACE/ace/config-macros.h: + * ACE/ace/os_include/sys/os_types.h: + * TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp: + +commit 17a3a7e2eaf969480c4c26d30b74c95ce90d842e +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Apr 25 10:50:22 2020 +0200 + + Map ACE_CDR LongLong to ACE_INT64, all platforms for which we needed an emulation have been deprecated in the past. + + * ACE/ace/CDR_Base.cpp: + * ACE/ace/CDR_Base.h: + * ACE/ace/CDR_Size.h: + * ACE/ace/README: + * ACE/ace/config-kfreebsd.h: + * ACE/ace/config-qnx.h: + * TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp: + * TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp: + * TAO/TAO_IDL/be/be_visitor_attr_init.cpp: + * TAO/TAO_IDL/be/be_visitor_null_return_value.cpp: + * TAO/TAO_IDL/fe/idl.yy.cpp: + * TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp: + * TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp: + * TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp: + +commit 31492dcfc3c8a7effcb605175ceb99e8ba74a8b4 +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Fri Apr 24 10:26:34 2020 -0500 + + platform_clang_common.GNU: redirect stderr for version checks + + This part was changed in PR #1022 caused a lot of extra output using clang on macOS. + This commit redirects stderr from make's $(shell). + +commit d0893fa9be9c5082fce02e396df1d31523e3d87a +Merge: b08f0537851 0fef7507641 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Apr 24 14:19:09 2020 +0200 + + Merge pull request #1087 from jwillemsen/jwi-windows-arm + + Don't define _AMD64_ when we are cross compiling for ARM + +commit 0fef75076417267265e701ea2442ae30de3573db +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Apr 24 12:23:14 2020 +0200 + + Don't define _AMD64_ when we are cross compiling for ARM + + * ACE/ace/config-win32-common.h: + +commit 1e13908ba3493cbf71b16a5497394ee7e4e62dcc +Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com> +Date: Thu Apr 23 18:01:15 2020 +0100 + + modify make_release.py to update debian/control only + + Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> + +commit 50769cdc322a7bfbd610faadc6919dc3e69b9758 +Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com> +Date: Wed Apr 22 20:40:16 2020 +0100 + + modify debian/rules to read version and rename files accordingly + + Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> + +commit 8b6a7935302fedbfce29af2c8d1104a56287f559 +Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com> +Date: Fri Apr 17 12:45:18 2020 +0100 + + Rename the debian files to a generalized name + + Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> + +commit aa415ef763d6df60e33831c9f1d628457b25d107 +Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com> +Date: Thu Apr 23 14:43:05 2020 +0100 + + Update copyright year + + Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> + +commit 9609100ac7f226ea056b60abcbc262015275eb5b +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Apr 23 13:16:40 2020 +0200 + + Layout changes + + * ACE/ace/Malloc_Base.h: + * ACE/ace/SString.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.cpp: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.h: + +commit aaf3877d5e0a2e3ad32579b7486c42c6c8506df0 +Author: Son Dinh <dinhs@objectcomputing.com> +Date: Wed Apr 22 16:02:49 2020 -0500 + + Add other C++11 types + +commit 1fe5ba46a105bd724581a0b399d1c087161831c2 +Merge: 5690875ec8a 685825a3ad4 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Apr 22 17:37:00 2020 +0200 + + Merge pull request #1084 from egleston/master + + Additions related to rpmbuild + +commit 0b555fda14d907a17a5f52ff509c2d7e14ad9bcf +Author: Brian Egleston <github@kamash.com> +Date: Wed Apr 22 08:44:45 2020 -0600 + + Update ace-tao.spec + +commit 9154b57c1621b7fe8925a11859d8821b263cbdb0 +Author: Brian Egleston <github@kamash.com> +Date: Tue Apr 21 15:45:14 2020 -0600 + + Update ace-tao.spec + + Install and add tao_ifr_service to catalog + +commit e42218837fea18d740b8d7d6659ef990fab27897 +Author: Brian Egleston <github@kamash.com> +Date: Tue Apr 21 15:42:43 2020 -0600 + + Remove build dependency on sendmail + +commit 340c506c5a2204289384102a0658c6e194c3194d +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Apr 21 19:50:00 2020 +0200 + + Doxygen changes + + * ACE/ace/WFMO_Reactor.h: + +commit a10857b29949cc2dd3b19936762b6c42bc076b7c +Merge: c4abde15b61 9724ca583c8 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Apr 21 19:47:50 2020 +0200 + + Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO + +commit c4abde15b611512b15a76cc9a48648ae0111a41f +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Apr 21 19:47:24 2020 +0200 + + Doxygen changes + + * ACE/ace/WFMO_Reactor.h: + +commit 9724ca583c8523f6095b1319ab4449f0cc110fc9 +Merge: 74c7286648e 37bb69d7db0 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Apr 21 19:46:54 2020 +0200 + + Merge pull request #1075 from likema/remove-unimplemented-func + + Remove unimplemented ACE_WFMO_Reactor_Handler_Repository::bind declare. + +commit 74c7286648e164ff597b601a2a6eefd6f9b54b44 +Merge: c9a9c59cc45 9a020fae9c5 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Apr 20 08:36:17 2020 +0200 + + Merge pull request #1080 from jwillemsen/master + + Removed ACE_Allocator::delete_allocator_, it is not used at all + +commit ac3abf49acfe2fad2da6dfc11e4a13a268c3ff32 +Author: Son Dinh <dinhs@objectcomputing.com> +Date: Sun Apr 19 21:54:22 2020 -0500 + + Add hash functors conditionally and related overloaded operators + +commit 9a020fae9c55b322a4e1048a2531ce6e0bbe401a +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Apr 18 16:25:03 2020 +0200 + + Removed ACE_Allocator::delete_allocator_, it is not used at all and according to the old comments it shouldn't be used. + + * ACE/ace/Malloc.cpp: + * ACE/ace/Malloc_Allocator.cpp: + * ACE/ace/Malloc_Base.h: + +commit 601491ce979d21147c9e8449825084e252c17579 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Apr 18 16:17:14 2020 +0200 + + Changed ACE_Allocator::delete_allocator_ to be a bool + + * ACE/ace/Malloc.cpp: + * ACE/ace/Malloc_Allocator.cpp: + * ACE/ace/Malloc_Base.h: + +commit 1193c157cd2019d9736aab979fdc0989a28c8ee2 +Author: Son Dinh <dinhs@objectcomputing.com> +Date: Fri Apr 17 16:00:09 2020 -0500 + + map ULongLong to unsigned long to resolve TAO_OutStream overloaded operator error + +commit f0eeddf26c5a9571d9ebac269bbe5ca9b473740b +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Fri Apr 17 09:11:57 2020 -0500 + + Windows API usage updates from #1069 + +commit e8b8245004ddf3874ab2079c4feddf70fe7a5be8 +Merge: 0031eb38fb7 509b105b343 +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Thu Apr 16 16:21:28 2020 -0500 + + Merge pull request #1069 from jrw972/ipv6-recvinfo-macos + + IPv6 and RECVINFO on macOS; Windows if_nametoindex + +commit f206fe4e74e77bd09dee33e7c80e794883b49308 +Author: Son Dinh <dinhs@objectcomputing.com> +Date: Thu Apr 16 13:00:52 2020 -0500 + + added hash for long long and unsigned long long + +commit 509b105b343eeffe57504562e4cdd96c23414cf8 +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Thu Apr 16 09:05:10 2020 -0500 + + Update for FACE Safety configuration on Linux + +commit 85e95c04396e011b71eb7efe509e68f4be65e4dc +Author: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk> +Date: Wed Apr 15 23:07:58 2020 +0100 + + Update Vcs link to salsa + + Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk> + +commit 4384e141fb48ce4cd9dfa837420036cd8a78fc21 +Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com> +Date: Wed Apr 15 20:18:52 2020 +0100 + + Update maintainer to valid team email + + Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> + +commit 2d1d074a5c2e6fc4f6a7670b551d6cc0e75c1440 +Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com> +Date: Wed Apr 15 20:02:29 2020 +0100 + + remove lintian override for debhelper + + Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> + +commit e157641f3c72af6e2c34d86b2fb31302832bf320 +Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com> +Date: Wed Apr 15 18:38:35 2020 +0100 + + Update doc-base location + + Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> + +commit 12691da3e9248d1bfd56164ed5a982d61f9de497 +Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com> +Date: Wed Apr 15 16:40:34 2020 +0100 + + no need to use LD_LIBRARY_PATH, dpkg-shlibdeps will take care + + Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> + +commit 5ed55fd6a3a2d8a60b7c1d75bc3864e532ed58cf +Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com> +Date: Wed Apr 15 15:30:48 2020 +0100 + + install shared library in multiarch location + + Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> + +commit 8039e5058d85b8f62b506fb3eec5ffe0201a99b7 +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Wed Apr 15 17:02:09 2020 -0500 + + Continued changes from peer review + +commit b817dea988a108910cca55c2dff335ffb36b79b0 +Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com> +Date: Wed Apr 15 13:35:58 2020 +0100 + + Add -g for debug symbols and stop modifying flags directly + + Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> + +commit 25492973a651b952094897aa3488a8f96442cc3d +Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com> +Date: Wed Apr 15 13:19:58 2020 +0100 + + Remove --list-missing, dh_missing will be used by debhelper + + Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> + +commit 597ac0878bed3b50abb075e4164813c1a4dcf3d8 +Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com> +Date: Wed Apr 15 13:00:23 2020 +0100 + + Use debhelper-compat and update compat level to 12 + + Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> + +commit 9d534df24ad691429c607777549be31b45c5ec4b +Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com> +Date: Wed Apr 15 12:59:35 2020 +0100 + + Update Standards-Version to 4.5.0 + + Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> + +commit 94c1ac1426059c78a6173e2c6c907bf1f232138f +Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com> +Date: Wed Apr 15 11:55:06 2020 +0100 + + Remove symbols lintian override + + Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> + +commit 0121bf7af483a5b92a0d34842757999f2daba4cf +Author: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk> +Date: Wed Apr 15 22:40:55 2020 +0100 + + Remove patches which has been applied upstream + + Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> + +commit 6bba4e6ab236c0357b76ed8f7e5e7792b608de22 +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Wed Apr 15 16:41:46 2020 -0500 + + Support if_nametoindex on Windows - responded to review comments. + +commit 0bfda90753c38250d4e52513d099087f28d155a9 +Merge: 2d7ae202186 54554146263 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Apr 14 10:20:11 2020 +0200 + + Merge pull request #1076 from jwillemsen/master + + Make use of https download.dre link + +commit 54554146263fa81226ba54061170036fc329b595 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Apr 14 09:11:16 2020 +0200 + + Use https links + + * ACE/docs/Download.html: + +commit a1b647e4348ddff1242655c05f9b7d214bc11643 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Apr 14 08:22:09 2020 +0200 + + Make use of https download.dre + + * ACE/Kokyu/docs/Kokyu.html: + * ACE/README: + * ACE/ace/DLL_Manager.h: + * ACE/ace/FIFO_Send.h: + * ACE/ace/Managed_Object.h: + * ACE/ace/config-win32-common.h: + * ACE/debian/README.source: + * ACE/docs/Download.html: + * TAO/TAO-INSTALL.html: + * TAO/docs/Security/Download.html: + * TAO/docs/tutorials/Quoter/index.html: + +commit 336b5d7ddb8a0d306e62e80b31f7838a4e359b36 +Author: Justin R. Wilson <wilsonj@objectcomputing.com> +Date: Mon Apr 13 12:03:14 2020 -0500 + + Check but don't define _WIN32_WINNT + +commit 37bb69d7db0a49d61676d68df8c2136c6b20b348 +Author: Like Ma <likemartinma@gmail.com> +Date: Sun Apr 12 03:00:40 2020 +0800 + + Remove unimplemented ACE_WFMO_Reactor_Handler_Repository::bind declare. + +commit abf9f445c4d0c9189ca5cc6c2495f8953ca3f3a6 +Author: Like Ma <likemartinma@gmail.com> +Date: Sat Apr 11 18:14:36 2020 +0800 + + Fix Dev_Poll_Reactor comment. + +commit ae87fba1b2b23893e3273bd4f70e3ae93b9d105b +Author: Justin R. Wilson <wilsonj@objectcomputing.com> +Date: Thu Apr 9 14:11:46 2020 -0500 + + Fix scoping issue + +commit ceb4c6b8853ecf9d94e82c744faaaf19fbe5da4c +Author: Justin R. Wilson <wilsonj@objectcomputing.com> +Date: Thu Apr 9 13:18:13 2020 -0500 + + Handle Windows + +commit 71a255781a2dd7349037bda4686120b13c531f12 +Author: Justin R. Wilson <wilsonj@objectcomputing.com> +Date: Wed Apr 8 11:20:57 2020 -0500 + + From review + +commit e16a8b3a407037e4c8aeb1ee36fd7654d74434d4 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Apr 8 14:38:30 2020 +0200 + + use https link + + * ACE/debian/control: + +commit 1ac8bb0998f40b2c3bf9265a2c979971f0d921ef +Author: Justin R. Wilson <wilsonj@objectcomputing.com> +Date: Tue Apr 7 13:23:28 2020 -0500 + + IPV6 and RECVINFO on MacOS + +commit 2d2a72910bfe8bb47da969ebf1188bddfea8d1c4 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Mar 31 17:18:30 2020 +0200 + + Layout and doxygen changes + + * ACE/ace/Filecache.h: + * ACE/ace/Framework_Component.h: + * ACE/ace/Future.h: + * ACE/ace/Handle_Gobbler.h: + * ACE/ace/MEM_IO.h: + +commit 05a9d1d62c79904ec6184963d09d542415377e22 +Merge: 8e31d326bb7 c8bd212bddc +Author: Justin Wilson <wilsonj@objectcomputing.com> +Date: Fri Mar 27 10:53:37 2020 -0500 + + Merge pull request #1061 from jrw972/site-local-addr + + Add is_sitelocal predicate to INET_Addr + +commit 8e31d326bb7543206982bcc53b6d8a0c7a103aa5 +Merge: c2bb0005cf6 78a473da451 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Mar 25 15:52:08 2020 +0100 + + Merge pull request #1062 from jwillemsen/jwi-clang10 + + Add clang10 configuration + +commit 78a473da451683f676b20ead9a5a135b63d1b7a9 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Mar 25 12:10:54 2020 +0100 + + Update workaround for clang10 + + * ACE/tests/Compiler_Features_32_Test.cpp: + +commit c8bd212bddc177f4d740961171f4ff3a275d34c4 +Author: Justin R. Wilson <wilsonj@objectcomputing.com> +Date: Tue Mar 24 13:54:23 2020 -0500 + + Add is_sitelocal predicate to INET_Addr + +commit 86f85665e7ba12262722613dc55900fba3880c8f +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Mar 24 08:34:25 2020 +0100 + + Remove redundant new line + +commit c2bb0005cf63ab06f9e991418fdee5b22a3c8db8 +Merge: 6a3c9dec68c afb9f6bac90 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Mar 17 18:44:03 2020 +0100 + + Merge pull request #1058 from jwillemsen/jwi-dlopenerrorlogging + + Log all dlopen errors into the error stack coming from ACE_OS::dlopen + +commit afb9f6bac9051b77180178d541b9ae1555717e1f +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Mar 17 08:58:24 2020 +0100 + + Guard logging block with a check whether we have debug logging enabled or not + + * ACE/ace/DLL_Manager.cpp: + +commit 0fbb87631ca509aa1bc0c69688efaec94c5ad8a1 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Mar 17 08:56:32 2020 +0100 + + Put back error logging on failure + + * ACE/ace/DLL_Manager.cpp: + +commit 3adffd0604f5b41d3864d8804ebd740fb5efb230 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Mar 16 16:51:05 2020 +0100 + + Moved the error logging to the open_i call where the error is detected, this simplifies the calling code a lot. + + We don't check for ENOENT anymore as error, an unresolved symbol causes also ENOENT and we want to get that error back to the caller. As side effect any loading of the implied dll names (different prefix/extensions) also trigger an error log but at the moment one succeeds the caller shouldn't check the error stack + + * ACE/ace/DLL.cpp: + * ACE/ace/DLL_Manager.cpp: + * ACE/ace/DLL_Manager.h: + +commit f569652bf8f860eb33195c6cc9968c5ff3ac87e8 +Merge: d87ae65d2cf ca7a968b62d +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Mar 13 18:34:52 2020 +0100 + + Merge pull request #1056 from jwillemsen/jwi-logcatconst + + Const enhancements + +commit ca7a968b62d081e3f392cfee5c415924276d95bf +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Mar 13 16:48:23 2020 +0100 + + Const enhancements + + * ACE/ace/Log_Category.h: + * ACE/ace/Log_Category.inl: + +commit 66e3a86dd4f094a23a29401e8012b0d423aa6b94 +Author: Like Ma <likemartinma@gmail.com> +Date: Thu Mar 12 11:54:45 2020 +0800 + + Fix build warnings. + + Value stored to 'n' is never read + +commit 2191325ddf5d639abc7268bc2436e7be37270033 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Mar 2 15:39:56 2020 +0100 + + Documentation and layout changes + + * ACE/ace/Msg_WFMO_Reactor.h: + * ACE/ace/QtReactor/QtReactor.cpp: + * ACE/ace/Sig_Handler.cpp: + +commit 146ff59c1108278f52d0664ebd4dcdd64df132d2 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Mar 2 14:59:16 2020 +0100 + + Documentation changes + + * ACE/ace/Dev_Poll_Reactor.h: + * ACE/ace/MMAP_Memory_Pool.h: + * ACE/ace/Sig_Handler.cpp: + * ACE/ace/Sig_Handler.h: + +commit 7dac17d8fc89cad5d5561f395f21e21027bd9994 +Merge: 6eb551083bc 21f2ca12640 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Feb 27 13:56:00 2020 +0100 + + Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO + +commit 77e933bf6819c7e55b4c172d03cba9d63337b0ac +Author: Brian Egleston <github@kamash.com> +Date: Fri Feb 21 11:51:59 2020 -0700 + + Update ace-tao.spec + + pre-define inline so it is available during skip_make processing + +commit 0f9a4b69d7c383968da3b4a1151356d4b74bb97a +Author: Mouse <mouse07410@users.noreply.github.com> +Date: Wed Feb 19 16:06:45 2020 -0500 + + Update Compiler_Features_32_Test.cpp + + Make it work with Apple Xcode-11.3.1 Clang compiler + +commit 6eb551083bc1f7d6527f6a810c9438ee3ef04551 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Feb 10 10:06:46 2020 +0100 + + Update for next release + + * ACE/bin/copy-local-script.sh: + +commit 97364bb7c541e2709321272443949cd22d0f9686 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Feb 10 09:44:35 2020 +0100 + + Make ACE/TAO 6.5.8/2.5.8 public and prepare for next release + + * ACE/NEWS: + * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: + * ACE/docs/Download.html: + * ACE/docs/bczar/bczar.html: + * ACE/etc/index.html: + * TAO/NEWS: diff --git a/ACE/Kokyu/docs/Kokyu.html b/ACE/Kokyu/docs/Kokyu.html index fb1b0905e3a..e785f949859 100644 --- a/ACE/Kokyu/docs/Kokyu.html +++ b/ACE/Kokyu/docs/Kokyu.html @@ -357,7 +357,7 @@ interface is in <tt>Kokyu::DSRT_Dispatcher (Kokyu_dsrt.h)</tt> <h3> <a NAME="Status"></a>Current status</h3> Kokyu dispatching framework is available as a separate module under <tt><font size=+1>ACE_wrappers/Kokyu</font></tt> -as part of the <a href="http://download.dre.vanderbilt.edu">ACE/TAO +as part of the <a href="https://download.dre.vanderbilt.edu">ACE/TAO distribution</a>. Note that this module is not dependent on TAO, though it is built on top of ACE. The TAO Event Channel uses the Strategy and Service Configurator patterns to use configurable dispatching modules. @@ -1,6 +1,33 @@ +USER VISIBLE CHANGES BETWEEN ACE-6.5.9 and ACE-6.5.10 +===================================================== + +. Add support for Embarcadero C++ Builder 10.4 Sydney using the + classic compiler. ACE/TAO compile with the new 32/64 bit clang + compilers but runtime tests show several runtime problems which + makes them not safe to use + +. Make a change in the ACE Process Manager to resolve an internal + compiler error with Visual Studio 2019 16.5.x compilers + +. Android enhancements for if_nameindex + USER VISIBLE CHANGES BETWEEN ACE-6.5.8 and ACE-6.5.9 ==================================================== +. On Windows, ACE no longer defines _WIN32_WINNT. ACE wrappers for + if_nametoindex and if_indextoname are available if the version of the + Windows SDK supports them. + +. IPv6 extended datagram receive info now supported on macOS. + +. ACE_(U)INT8/16/32/64 map to (u)int8/16/32/64_t when C++11 has been + enabled. + +. CDR_Base uses ACE_INT64 for LongLong, all old emulated support + has been removed + +. Updated debian and rpm packaging support + USER VISIBLE CHANGES BETWEEN ACE-6.5.7 and ACE-6.5.8 ==================================================== diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM index 91fe85ad2f5..c97905e5e29 100644 --- a/ACE/PROBLEM-REPORT-FORM +++ b/ACE/PROBLEM-REPORT-FORM @@ -1,23 +1,23 @@ [Please use the PRF form below to submit bug reports, problem reports, etc., to the ACE developers and interested users. Send it to ace-bugs@list.isis.vanderbilt.edu, you must be subscribed to the list - in order to be able to post to it. If you are using OCI, PrismTech, or + in order to be able to post to it. If you are using OCI, MicroFocus, or Riverace's versions of ACE do not send bugs to this mailing list, but instead contact those companies for support. Please also send your PRF as plain ASCII text, _not_ uuencoded or as an attachment. - We prefer that all bug reports be submitted through our bug tracking - system. See $ACE_ROOT/docs/usage-bugzilla.html for more information + We prefer that all bug reports be submitted through github issues. + See https://github.com/DOCGroup/ACE_TAO/issues for more information about how to do this. If you are unsure as to whether your problem is a real bug or not then please submit your question to the mailing list using the following form. Not using the problem report form will make it harder or impossible to identify the problem, and in many cases we will be unable to help at all. Also please try to - browse bugzilla and the ChangeLog files to find out if your problem - has been solved in a more recent version of ACE. + browse the existing github isssues and the ChangeLog files to find + out if your problem has been solved in a more recent version of ACE. To subscribe to the list see - http://www.dre.vanderbilt.edu/~schmidt/ACE-mail.html + https://www.dre.vanderbilt.edu/~schmidt/ACE-mail.html Replace/remove all the explanatory text in brackets before mailing. @@ -40,7 +40,7 @@ To: ace-bugs@list.isis.vanderbilt.edu Subject: [area]: [synopsis] - ACE VERSION: 6.5.8 + ACE VERSION: 6.5.9 HOST MACHINE and OPERATING SYSTEM: If on Windows based OS's, which version of WINSOCK do you diff --git a/ACE/README b/ACE/README index b068df84d95..e00ba30f2e3 100644 --- a/ACE/README +++ b/ACE/README @@ -1,6 +1,6 @@ This document is also available at the following URL: -http://www.dre.vanderbilt.edu/~schmidt/ACE.html +https://www.dre.vanderbilt.edu/~schmidt/ACE.html All software and documentation is available via both anonymous ftp and http. @@ -148,7 +148,7 @@ applications provided with the ACE release include: OBTAINING ACE ACE may be obtained electronically from -http://download.dre.vanderbilt.edu. This release contains the source +https://download.dre.vanderbilt.edu. This release contains the source code, test drivers, and example applications (including JAWS) for C++ wrapper libraries and the higher-level ACE network programming framework developed as part of the ADAPTIVE project at the University diff --git a/ACE/VERSION.txt b/ACE/VERSION.txt index abe0fcef491..49b343637f3 100644 --- a/ACE/VERSION.txt +++ b/ACE/VERSION.txt @@ -1,4 +1,4 @@ -This is ACE version 6.5.8, released Mon Feb 10 09:28:37 CET 2020 +This is ACE version 6.5.9, released Fri May 01 09:57:51 CEST 2020 If you have any problems with or questions about ACE, please send e-mail to the ACE mailing list (ace-bugs@list.isis.vanderbilt.edu), diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp index bc2cc405335..146881f0c7c 100644 --- a/ACE/ace/ACE.cpp +++ b/ACE/ace/ACE.cpp @@ -1014,7 +1014,6 @@ ACE::recvv_n_i (ACE_HANDLE handle, if (result != -1) { // Blocking subsided. Continue data transfer. - n = 0; continue; } } @@ -1078,7 +1077,6 @@ ACE::recvv_n_i (ACE_HANDLE handle, { // Blocking subsided in <timeout> period. Continue // data transfer. - n = 0; continue; } } @@ -1806,7 +1804,6 @@ ACE::sendv_n_i (ACE_HANDLE handle, if (result != -1) { // Blocking subsided. Continue data transfer. - n = 0; continue; } } @@ -1876,7 +1873,6 @@ ACE::sendv_n_i (ACE_HANDLE handle, { // Blocking subsided in <timeout> period. Continue // data transfer. - n = 0; continue; } } diff --git a/ACE/ace/ACE_export.h b/ACE/ace/ACE_export.h index 700e562f7fc..7cb9fa2bb9e 100644 --- a/ACE/ace/ACE_export.h +++ b/ACE/ace/ACE_export.h @@ -42,12 +42,7 @@ # define ACE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) #endif /* ACE_HAS_DLL */ -// Added by hand to help with ACE_OS namespace -#if defined (__TANDEM) && defined (USE_EXPLICIT_EXPORT) -#define ACE_NAMESPACE_STORAGE_CLASS ACE_EXPORT_MACRO extern -#else #define ACE_NAMESPACE_STORAGE_CLASS extern ACE_EXPORT_MACRO -#endif #if defined (__ACE_INLINE__) # define ACE_NAMESPACE_INLINE_FUNCTION inline diff --git a/ACE/ace/Auto_Ptr.h b/ACE/ace/Auto_Ptr.h index 83f8ba21042..47ad7c39702 100644 --- a/ACE/ace/Auto_Ptr.h +++ b/ACE/ace/Auto_Ptr.h @@ -30,7 +30,6 @@ # pragma warning(disable: 4284) #endif /* _MSC_VER */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** @@ -69,15 +68,21 @@ protected: ACE_END_VERSIONED_NAMESPACE_DECL +#if defined (ACE_HAS_CPP17) +// C++17 has removed std::auto_ptr but this is heavily used +// in ACE and TAO tests so for the moment we are providing +// our own auto_ptr implementation +# define ACE_LACKS_AUTO_PTR +# include <memory> +#endif /* ACE_HAS_CPP17 */ + #if !defined (ACE_LACKS_AUTO_PTR) && \ defined (ACE_HAS_STANDARD_CPP_LIBRARY) && \ (ACE_HAS_STANDARD_CPP_LIBRARY != 0) #include <memory> #if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && \ (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0) -#if !defined (ACE_HAS_CPP17) using std::auto_ptr; -#endif /* !ACE_HAS_CPP17 */ #endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ #else /* ACE_HAS_STANDARD_CPP_LIBRARY */ diff --git a/ACE/ace/Basic_Types.h b/ACE/ace/Basic_Types.h index f621ce65c8c..67916f8dc06 100644 --- a/ACE/ace/Basic_Types.h +++ b/ACE/ace/Basic_Types.h @@ -29,8 +29,8 @@ * - ACE_UINT16 * - ACE_INT32 * - ACE_UINT32 - * - ACE_UINT64 * - ACE_INT64 + * - ACE_UINT64 * * Byte-order (endian-ness) determination: * ACE_BYTE_ORDER, to either ACE_BIG_ENDIAN or ACE_LITTLE_ENDIAN @@ -70,6 +70,17 @@ # include <inttypes.h> # endif +# if defined (ACE_HAS_CPP11) +# define ACE_HAS_INT8_T +# define ACE_HAS_UINT8_T +# define ACE_HAS_INT16_T +# define ACE_HAS_UINT16_T +# define ACE_HAS_INT32_T +# define ACE_HAS_UINT32_T +# define ACE_HAS_INT64_T +# define ACE_HAS_UINT64_T +# endif /* ACE_HAS_CPP11 */ + #ifdef ACE_LACKS_INTPTR_T # include "ace/If_Then_Else.h" @@ -208,28 +219,28 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // typedefs for whatever we can. Some of these are needed for certain // cases of ACE_UINT64, so do them before the 64-bit stuff. -#if defined (ACE_INT8_TYPE) - typedef ACE_INT8_TYPE ACE_INT8; -#elif defined (ACE_HAS_INT8_T) +#if defined (ACE_HAS_INT8_T) typedef int8_t ACE_INT8; +#elif defined (ACE_INT8_TYPE) + typedef ACE_INT8_TYPE ACE_INT8; #elif !defined (ACE_LACKS_SIGNED_CHAR) typedef signed char ACE_INT8; #else typedef char ACE_INT8; #endif /* defined (ACE_INT8_TYPE) */ -#if defined (ACE_UINT8_TYPE) - typedef ACE_UINT8_TYPE ACE_UINT8; -#elif defined (ACE_HAS_UINT8_T) +#if defined (ACE_HAS_UINT8_T) typedef uint8_t ACE_UINT8; +#elif defined (ACE_UINT8_TYPE) + typedef ACE_UINT8_TYPE ACE_UINT8; #else typedef unsigned char ACE_UINT8; #endif /* defined (ACE_UINT8_TYPE) */ -#if defined (ACE_INT16_TYPE) - typedef ACE_INT16_TYPE ACE_INT16; -#elif defined (ACE_HAS_INT16_T) +#if defined (ACE_HAS_INT16_T) typedef int16_t ACE_INT16; +#elif defined (ACE_INT16_TYPE) + typedef ACE_INT16_TYPE ACE_INT16; #elif ACE_SIZEOF_SHORT == 2 typedef short ACE_INT16; #elif ACE_SIZEOF_INT == 2 @@ -238,10 +249,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL # error Have to add to the ACE_INT16 type setting #endif /* defined (ACE_INT16_TYPE) */ -#if defined (ACE_UINT16_TYPE) - typedef ACE_UINT16_TYPE ACE_UINT16; -#elif defined (ACE_HAS_UINT16_T) +#if defined (ACE_HAS_UINT16_T) typedef uint16_t ACE_UINT16; +#elif defined (ACE_UINT16_TYPE) + typedef ACE_UINT16_TYPE ACE_UINT16; #elif ACE_SIZEOF_SHORT == 2 typedef unsigned short ACE_UINT16; #elif ACE_SIZEOF_INT == 2 @@ -250,10 +261,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL # error Have to add to the ACE_UINT16 type setting #endif /* defined (ACE_UINT16_TYPE) */ -#if defined (ACE_INT32_TYPE) - typedef ACE_INT32_TYPE ACE_INT32; -#elif defined (ACE_HAS_INT32_T) +#if defined (ACE_HAS_INT32_T) typedef int32_t ACE_INT32; +#elif defined (ACE_INT32_TYPE) + typedef ACE_INT32_TYPE ACE_INT32; #elif ACE_SIZEOF_INT == 4 typedef int ACE_INT32; #elif ACE_SIZEOF_LONG == 4 @@ -262,10 +273,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL # error Have to add to the ACE_INT32 type setting #endif /* defined (ACE_INT32_TYPE) */ -#if defined (ACE_UINT32_TYPE) - typedef ACE_UINT32_TYPE ACE_UINT32; -#elif defined (ACE_HAS_UINT32_T) +#if defined (ACE_HAS_UINT32_T) typedef uint32_t ACE_UINT32; +#elif defined (ACE_UINT32_TYPE) + typedef ACE_UINT32_TYPE ACE_UINT32; #elif ACE_SIZEOF_INT == 4 typedef unsigned int ACE_UINT32; #elif ACE_SIZEOF_LONG == 4 @@ -274,10 +285,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL # error Have to add to the ACE_UINT32 type setting #endif /* defined (ACE_UINT32_TYPE) */ -#if defined (ACE_INT64_TYPE) - typedef ACE_INT64_TYPE ACE_INT64; -#elif defined (ACE_HAS_INT64_T) +#if defined (ACE_HAS_INT64_T) typedef int64_t ACE_INT64; +#elif defined (ACE_INT64_TYPE) + typedef ACE_INT64_TYPE ACE_INT64; #elif ACE_SIZEOF_LONG == 8 typedef long ACE_INT64; #elif ACE_SIZEOF_LONG_LONG == 8 @@ -289,10 +300,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL typedef long long ACE_INT64; #endif /* defined (ACE_INT64_TYPE) */ -#if defined (ACE_UINT64_TYPE) - typedef ACE_UINT64_TYPE ACE_UINT64; -#elif defined (ACE_HAS_UINT64_T) +#if defined (ACE_HAS_UINT64_T) typedef uint64_t ACE_UINT64; +#elif defined (ACE_UINT64_TYPE) + typedef ACE_UINT64_TYPE ACE_UINT64; #elif ACE_SIZEOF_LONG == 8 typedef unsigned long ACE_UINT64; #elif ACE_SIZEOF_LONG_LONG == 8 @@ -429,9 +440,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL # define ACE_UINT64_LITERAL(n) n ## ui64 # define ACE_INT64_LITERAL(n) n ## i64 # endif /* defined (__MINGW32__) */ -#elif defined (__TANDEM) -# define ACE_UINT64_LITERAL(n) n ## LL -# define ACE_INT64_LITERAL(n) n ## LL #else /* ! ACE_WIN32 */ # define ACE_UINT64_LITERAL(n) n ## ull # define ACE_INT64_LITERAL(n) n ## ll diff --git a/ACE/ace/CDR_Base.cpp b/ACE/ace/CDR_Base.cpp index 56b65f08080..b87380ee507 100644 --- a/ACE/ace/CDR_Base.cpp +++ b/ACE/ace/CDR_Base.cpp @@ -584,21 +584,6 @@ ACE_CDR::consolidate (ACE_Message_Block *dst, return 0; } -#if defined (NONNATIVE_LONGLONG) -bool -ACE_CDR::LongLong::operator== (const ACE_CDR::LongLong &rhs) const -{ - return this->h == rhs.h && this->l == rhs.l; -} - -bool -ACE_CDR::LongLong::operator!= (const ACE_CDR::LongLong &rhs) const -{ - return this->l != rhs.l || this->h != rhs.h; -} - -#endif /* NONNATIVE_LONGLONG */ - #if defined (NONNATIVE_LONGDOUBLE) ACE_CDR::LongDouble& ACE_CDR::LongDouble::assign (const ACE_CDR::LongDouble::NativeImpl& rhs) diff --git a/ACE/ace/CDR_Base.h b/ACE/ace/CDR_Base.h index 71f5b328ce2..a8b49e5a0a1 100644 --- a/ACE/ace/CDR_Base.h +++ b/ACE/ace/CDR_Base.h @@ -205,53 +205,9 @@ public: typedef ACE_UINT16 UShort; typedef ACE_INT32 Long; typedef ACE_UINT32 ULong; + typedef ACE_INT64 LongLong; typedef ACE_UINT64 ULongLong; -# if (defined (_MSC_VER)) || (defined (__BORLANDC__)) - typedef __int64 LongLong; -# elif ACE_SIZEOF_LONG == 8 - typedef long LongLong; -# elif defined(__TANDEM) - typedef long long LongLong; -# elif ACE_SIZEOF_LONG_LONG == 8 -# if defined (sun) && !defined (ACE_LACKS_U_LONGLONG_T) - // sun #defines u_longlong_t, maybe other platforms do also. - // Use it, at least with g++, so that its -pedantic doesn't - // complain about no ANSI C++ long long. - typedef longlong_t LongLong; -# else - typedef long long LongLong; -# endif /* sun */ -# else /* no native 64 bit integer type */ -# define NONNATIVE_LONGLONG - struct ACE_Export LongLong - { -# if defined (ACE_BIG_ENDIAN) - ACE_CDR::Long h; - ACE_CDR::Long l; -# else - ACE_CDR::Long l; - ACE_CDR::Long h; -# endif /* ! ACE_BIG_ENDIAN */ - - /** - * @name Overloaded Relation Operators. - * - * The canonical comparison operators. - */ - //@{ - bool operator== (const LongLong &rhs) const; - bool operator!= (const LongLong &rhs) const; - //@} - }; -# endif /* no native 64 bit integer type */ - -# if defined (NONNATIVE_LONGLONG) -# define ACE_CDR_LONGLONG_INITIALIZER {0,0} -# else -# define ACE_CDR_LONGLONG_INITIALIZER 0 -# endif /* NONNATIVE_LONGLONG */ - # if ACE_SIZEOF_FLOAT == 4 typedef float Float; # else /* ACE_SIZEOF_FLOAT != 4 */ @@ -361,7 +317,7 @@ public: /// See OMG 2012-07-02 IDL-to-C++ Mapping v1.3 section 5.13 /// This class doesn't exactly match the IDL-to-C++ mapping because /// it is meant for use inside a union in the IDL compiler and therefore - /// has no constructors. Standards-based middlware libraries such as + /// has no constructors. Standards-based middleware libraries such as /// ORBs and DDSs can wrap this class in a class of their own to provide /// the exact interface described by the mapping specification. class ACE_Export Fixed diff --git a/ACE/ace/CDR_Size.h b/ACE/ace/CDR_Size.h index d37dac34ce0..c535924f1a0 100644 --- a/ACE/ace/CDR_Size.h +++ b/ACE/ace/CDR_Size.h @@ -157,7 +157,7 @@ private: ACE_CDR::ULong length); private: - /// Set to false when an error ocurrs. + /// Set to false when an error occurs. bool good_bit_; /// Current size. diff --git a/ACE/ace/Compression/rle/RLECompressor.cpp b/ACE/ace/Compression/rle/RLECompressor.cpp index 43d48e844b9..cbed31d58f1 100644 --- a/ACE/ace/Compression/rle/RLECompressor.cpp +++ b/ACE/ace/Compression/rle/RLECompressor.cpp @@ -1,7 +1,7 @@ #include "RLECompressor.h" #include "ace/OS_NS_string.h" -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x740) +#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) # pragma option push -w-8072 #endif @@ -140,6 +140,6 @@ ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, ACE_RLECompressor, ACE_SYNCH_M // Close versioned namespace, if enabled by the user. ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x740) +#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) # pragma option pop #endif diff --git a/ACE/ace/Configuration_Import_Export.cpp b/ACE/ace/Configuration_Import_Export.cpp index c9da29bfbfb..3b91d3226ad 100644 --- a/ACE/ace/Configuration_Import_Export.cpp +++ b/ACE/ace/Configuration_Import_Export.cpp @@ -410,7 +410,6 @@ ACE_Registry_ImpExp::export_section (const ACE_Configuration_Section_Key& sectio int index = 0; ACE_TString name; ACE_Configuration_Section_Key sub_key; - ACE_TString sub_section; while (!config_.enumerate_sections (section, index, name)) { ACE_TString sub_section (path); @@ -699,7 +698,6 @@ ACE_Ini_ImpExp::export_section (const ACE_Configuration_Section_Key& section, int index = 0; ACE_TString name; ACE_Configuration_Section_Key sub_key; - ACE_TString sub_section; while (!config_.enumerate_sections (section, index, name)) { ACE_TString sub_section (path); diff --git a/ACE/ace/DLL.cpp b/ACE/ace/DLL.cpp index 4fed8ba8db6..998a52a8827 100644 --- a/ACE/ace/DLL.cpp +++ b/ACE/ace/DLL.cpp @@ -276,7 +276,7 @@ ACE_DLL::set_handle (ACE_SHLIB_HANDLE handle, { ACE_TRACE ("ACE_DLL::set_handle"); - // Create a unique name. Note that this name is only quaranteed + // Create a unique name. Note that this name is only guaranteed // to be unique for the life of this object. ACE_TCHAR temp[ACE_UNIQUE_NAME_LEN]; ACE_OS::unique_name (this, temp, ACE_UNIQUE_NAME_LEN); diff --git a/ACE/ace/DLL_Manager.cpp b/ACE/ace/DLL_Manager.cpp index 68dda37c08a..8151097896e 100644 --- a/ACE/ace/DLL_Manager.cpp +++ b/ACE/ace/DLL_Manager.cpp @@ -62,7 +62,7 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name, if (ACE::debug ()) ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) DLL_Handle::open: error, ") - ACE_TEXT ("tried to reopen %s with name %s\n"), + ACE_TEXT ("tried to reopen <%s> with name <%s>\n"), this->dll_name_, dll_name)); @@ -121,11 +121,9 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name, for (ACE_Array_Iterator<ACE_TString> name_iter (dll_names); name_iter.next (name); name_iter.advance ()) { - if (this->open_i (name->c_str (), open_mode)) + if (this->open_i (name->c_str (), open_mode, errors)) break; - this->log_error (name->c_str (), errors); - #if defined (AIX) # define SHR_O ACE_TEXT("(shr.o)") # define SHR_O_LEN (sizeof (SHR_O) / sizeof(ACE_TCHAR) - 1) @@ -161,34 +159,22 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name, if (this->open_i (aix_pathname, open_mode)) break; - - this->log_error (aix_pathname, errors); } #endif /* AIX */ } if (this->handle_ == ACE_SHLIB_INVALID_HANDLE) { - if (errors || ACE::debug ()) + if (ACE::debug ()) { ACE_TString errtmp; - if (errors) - { - errors->push (this->error (errtmp)); - } - - if (ACE::debug ()) - { - if (!errors) - this->error (errtmp); - ACELIB_ERROR ((LM_ERROR, - ACE_TEXT ("ACE (%P|%t) DLL_Handle::open (\"%s\"): ") - ACE_TEXT ("Invalid handle error: %s\n"), - this->dll_name_, - errtmp.c_str ())); - } + this->error (errtmp); + ACELIB_ERROR ((LM_ERROR, + ACE_TEXT ("ACE (%P|%t) DLL_Handle::open (\"%s\"): ") + ACE_TEXT ("Invalid handle error: %s\n"), + this->dll_name_, + errtmp.c_str ())); } - return -1; } } @@ -198,7 +184,7 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name, if (ACE::debug ()) ACELIB_DEBUG ((LM_DEBUG, - ACE_TEXT ("ACE (%P|%t) DLL_Handle::open - %s (%d), refcount=%d\n"), + ACE_TEXT ("ACE (%P|%t) DLL_Handle::open - <%s> (%d), refcount=%d\n"), this->dll_name_, this->handle_, this->refcount_)); @@ -231,7 +217,7 @@ ACE_DLL_Handle::close (int unload) if (ACE::debug ()) ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) DLL_Handle::close - ") - ACE_TEXT ("%s (handle=%d, refcount=%d)\n"), + ACE_TEXT ("<%s> (handle=%d, refcount=%d)\n"), this->dll_name_, this->handle_, this->refcount_)); @@ -243,7 +229,7 @@ ACE_DLL_Handle::close (int unload) if (ACE::debug ()) ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) DLL_Handle::close: ") - ACE_TEXT ("Unloading %s (handle=%d)\n"), + ACE_TEXT ("Unloading <%s> (handle=%d)\n"), this->dll_name_, this->handle_)); @@ -268,7 +254,7 @@ ACE_DLL_Handle::close (int unload) ACE_TString err; ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) DLL_Handle::close - ") - ACE_TEXT ("Failed with: \"%s\".\n"), + ACE_TEXT ("Failed with: <%s>\n"), this->error (err).c_str ())); } } @@ -316,8 +302,8 @@ ACE_DLL_Handle::symbol (const ACE_TCHAR *sym_name, bool ignore_errors, ACE_TStri if (ACE::debug ()) ACELIB_ERROR ((LM_ERROR, - ACE_TEXT ("ACE (%P|%t) DLL_Handle::symbol (\"%s\") ") - ACE_TEXT (" failed with \"%s\".\n"), + ACE_TEXT ("ACE (%P|%t) DLL_Handle::symbol <%s>") + ACE_TEXT (" failed with <%s>\n"), auto_name.get (), error.c_str ())); @@ -364,13 +350,15 @@ ACE_DLL_Handle::get_handle (bool become_owner) } // This method is used return the last error of a library operation. - ACE_TString & ACE_DLL_Handle::error (ACE_TString &err) { ACE_TRACE ("ACE_DLL_Handle::error"); const ACE_TCHAR *error = ACE_OS::dlerror (); - err = (error ? error : ACE_TEXT ("no error")); + if (error) + { + err = error; + } return err; } @@ -472,59 +460,34 @@ ACE_DLL_Handle::get_dll_names (const ACE_TCHAR *dll_name, } bool -ACE_DLL_Handle::open_i (const ACE_TCHAR *dll_name, int open_mode) +ACE_DLL_Handle::open_i (const ACE_TCHAR *dll_name, int open_mode, ERROR_STACK* errors) { // The ACE_SHLIB_HANDLE object is obtained. this->handle_ = ACE_OS::dlopen (dll_name, open_mode); - if (ACE::debug ()) + if (errors || ACE::debug ()) { ACE_TString err; - ACELIB_DEBUG ((LM_DEBUG, - ACE_TEXT ("ACE (%P|%t) DLL_Handle::open ") - ACE_TEXT ("(\"%s\", 0x%x) -> %s: %s\n"), - dll_name, - open_mode, - ((this->handle_ != ACE_SHLIB_INVALID_HANDLE) - ? ACE_TEXT ("succeeded") - : ACE_TEXT ("failed")), - this->error (err).c_str())); - } - - return this->handle_ != ACE_SHLIB_INVALID_HANDLE; -} - -void -ACE_DLL_Handle::log_error (const ACE_TCHAR *dll_name, ERROR_STACK *errors) -{ - // If errno is ENOENT we just skip over this one, anything - // else - like an undefined symbol, for instance - // must be flagged here or the next error will mask it. - // - // @TODO: If we've found our DLL _and_ it's broken, - // should we continue at all? - if (errno != ENOENT && (errors || ACE::debug ())) - { - ACE_TString errtmp; - if (errors) + this->error (err); + if (errors && err.length () > 0) { - errors->push (this->error (errtmp)); + errors->push (err); } - if (ACE::debug ()) { - if (!errors) - this->error (errtmp); - - ACELIB_ERROR ((LM_ERROR, - ACE_TEXT ("ACE (%P|%t) DLL_Handle::open ") - ACE_TEXT ("(\'%s\') failed, errno=") - ACE_TEXT ("%d: <%s>\n"), + ACELIB_DEBUG ((LM_DEBUG, + ACE_TEXT ("ACE (%P|%t) DLL_Handle::open_i ") + ACE_TEXT ("<%s>, 0x%x) -> <%s>: <%s>\n"), dll_name, - ACE_ERRNO_GET, - errtmp.c_str ())); + open_mode, + ((this->handle_ != ACE_SHLIB_INVALID_HANDLE) + ? ACE_TEXT ("succeeded") + : ACE_TEXT ("failed")), + err.c_str ())); } } + + return this->handle_ != ACE_SHLIB_INVALID_HANDLE; } /******************************************************************/ @@ -626,7 +589,7 @@ ACE_DLL_Manager::open_dll (const ACE_TCHAR *dll_name, if (ACE::debug ()) ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) DLL_Manager::open_dll: Could not ") - ACE_TEXT ("open dll %s.\n"), + ACE_TEXT ("open dll <%s>\n"), dll_name)); delete temp_handle; diff --git a/ACE/ace/DLL_Manager.h b/ACE/ace/DLL_Manager.h index 6c17ee7572c..3a98d2200be 100644 --- a/ACE/ace/DLL_Manager.h +++ b/ACE/ace/DLL_Manager.h @@ -28,7 +28,6 @@ #define ACE_DEFAULT_DLL_MANAGER_SIZE 1024 - ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** @@ -54,7 +53,7 @@ class ACE_Export ACE_DLL_Handle { public: /// Error stack. Fixed size should suffice. Ignores any errors exceeding the size. - typedef ACE_Fixed_Stack < ACE_TString, 10 > ERROR_STACK; + typedef ACE_Fixed_Stack <ACE_TString, 10> ERROR_STACK; /// Default construtor. ACE_DLL_Handle (void); @@ -164,18 +163,12 @@ private: * @a dll_name is first loaded * @li @c RTLD_GLOBAL: makes symbols available for relocation * processing of any other DLLs. - * @retval false On failure - * @retval true On success. - */ - bool open_i (const ACE_TCHAR *dll_name, int open_mode); - - /** - * This method logs error of opening the DLL. - * @param dll_name The filename or path of the DLL to load. * @param errors Optional address of an error stack to collect any errors * encountered. + * @retval false On failure + * @retval true On success */ - void log_error (const ACE_TCHAR *dll_name, ERROR_STACK *errors); + bool open_i (const ACE_TCHAR *dll_name, int open_mode, ERROR_STACK* errors); /// Disallow copying and assignment since we don't handle them. ACE_DLL_Handle (const ACE_DLL_Handle &); @@ -273,7 +266,6 @@ public: ACE_ALLOC_HOOK_DECLARE; protected: - /// Default constructor. ACE_DLL_Manager (int size = ACE_DLL_Manager::DEFAULT_SIZE); diff --git a/ACE/ace/Dev_Poll_Reactor.h b/ACE/ace/Dev_Poll_Reactor.h index 4720a118835..ed8640a30da 100644 --- a/ACE/ace/Dev_Poll_Reactor.h +++ b/ACE/ace/Dev_Poll_Reactor.h @@ -51,7 +51,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Sig_Handler; class ACE_Dev_Poll_Reactor; - // --------------------------------------------------------------------- /** @@ -98,7 +97,7 @@ public: /// Unimplemented method required by pure virtual method in abstract /// base class. /** - * This method's interface is not very compatibile with this + * This method's interface is not very compatible with this * Reactor's design. It's not clear why this method is pure virtual * either. */ @@ -377,7 +376,7 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl /// Returns the current table size. size_t size (void) const; - /// Returns the current table size. + /// Returns the maximum table size. size_t max_size (void) const; /// Dump the state of an object. diff --git a/ACE/ace/Dirent_Selector.h b/ACE/ace/Dirent_Selector.h index 0de9dc085ab..5f3051cf17e 100644 --- a/ACE/ace/Dirent_Selector.h +++ b/ACE/ace/Dirent_Selector.h @@ -4,7 +4,7 @@ /** * @file Dirent_Selector.h * - * Define a portable C++ interface to the <ACE_OS_Dirent::scandir> method. + * Define a portable C++ interface to the <ACE_OS::scandir> method. * * @author Rich Newman <RNewman@directv.com> */ diff --git a/ACE/ace/FIFO_Send.h b/ACE/ace/FIFO_Send.h index 37580662b02..4c885df4be8 100644 --- a/ACE/ace/FIFO_Send.h +++ b/ACE/ace/FIFO_Send.h @@ -8,7 +8,6 @@ */ //========================================================================== - #ifndef ACE_FIFO_SEND_H #define ACE_FIFO_SEND_H diff --git a/ACE/ace/Filecache.h b/ACE/ace/Filecache.h index fb66ea3ab94..4596edab25c 100644 --- a/ACE/ace/Filecache.h +++ b/ACE/ace/Filecache.h @@ -298,7 +298,6 @@ private: const ACE_TCHAR *s = ACE_TEXT ("ACE_Filecache_Object")); public: - enum Creation_States { ACE_READING = 1, diff --git a/ACE/ace/Framework_Component.h b/ACE/ace/Framework_Component.h index 9cf7c4d57a9..8ffba2d5fac 100644 --- a/ACE/ace/Framework_Component.h +++ b/ACE/ace/Framework_Component.h @@ -148,12 +148,10 @@ public: ACE_ALLOC_HOOK_DECLARE; protected: - /// Initialize the repository. ACE_Framework_Repository (int size = ACE_Framework_Repository::DEFAULT_SIZE); private: - /// Actually removes the dll components, must be called with locks held. int remove_dll_components_i (const ACE_TCHAR *dll_name); @@ -162,7 +160,6 @@ private: void compact (void); private: - /// Contains all the framework components. ACE_Framework_Component **component_vector_; diff --git a/ACE/ace/Functor.h b/ACE/ace/Functor.h index e01b79c8a13..8920966639d 100644 --- a/ACE/ace/Functor.h +++ b/ACE/ace/Functor.h @@ -200,6 +200,32 @@ public: unsigned long operator () (unsigned long t) const; }; +#if (ACE_SIZEOF_LONG == 8) +/** + * @brief Function object for hashing a long long number + */ +template<> +class ACE_Export ACE_Hash<long long> +{ +public: + /// Simply returns t + unsigned long operator () (long long t) const; +}; +#endif /* ACE_SIZEOF_LONG == 8 */ + +#if (ACE_SIZEOF_LONG == 8) +/** + * @brief Function object for hashing an unsigned long long number + */ +template<> +class ACE_Export ACE_Hash<unsigned long long> +{ +public: + /// Simply returns t + unsigned long operator () (unsigned long long t) const; +}; +#endif /* ACE_SIZEOF_LONG == 8 */ + #if (ACE_SIZEOF_LONG < 8) /** * @brief Function object for hashing a signed 64-bit number diff --git a/ACE/ace/Functor.inl b/ACE/ace/Functor.inl index f6a87f85f4d..d50490d9f2d 100644 --- a/ACE/ace/Functor.inl +++ b/ACE/ace/Functor.inl @@ -104,6 +104,22 @@ ACE_Hash<unsigned long>::operator () (unsigned long t) const return t; } +#if (ACE_SIZEOF_LONG == 8) +ACE_INLINE unsigned long +ACE_Hash<long long>::operator () (long long t) const +{ + return static_cast<unsigned long> (t); +} +#endif /* ACE_SIZEOF_LONG == 8 */ + +#if (ACE_SIZEOF_LONG == 8) +ACE_INLINE unsigned long +ACE_Hash<unsigned long long>::operator () (unsigned long long t) const +{ + return static_cast<unsigned long> (t); +} +#endif /* ACE_SIZEOF_LONG == 8 */ + // This #if needs to match the one in Functor.h #if (ACE_SIZEOF_LONG < 8) ACE_INLINE unsigned long diff --git a/ACE/ace/Functor_T.h b/ACE/ace/Functor_T.h index 33b955ae9c5..f89b683d567 100644 --- a/ACE/ace/Functor_T.h +++ b/ACE/ace/Functor_T.h @@ -91,7 +91,7 @@ class ACE_Member_Function_Command : public ACE_Command_Base public: typedef void (RECEIVER::*PTMF)(void); - /// Con Constructor: sets the <receiver_> of the Command to recvr, and the + /// Con Constructor: sets the <receiver_> of the Command to @a recvr, and the /// <action_> of the Command to <action>. ACE_Member_Function_Command (RECEIVER &recvr, PTMF ptmf); diff --git a/ACE/ace/Future.h b/ACE/ace/Future.h index d6275baa207..dcaf1eb7da4 100644 --- a/ACE/ace/Future.h +++ b/ACE/ace/Future.h @@ -81,8 +81,8 @@ public: /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; -protected: +protected: /// Constructor ACE_Future_Observer (void); }; @@ -217,13 +217,10 @@ private: mutable ACE_SYNCH_RECURSIVE_CONDITION value_ready_; private: - ACE_Future_Rep (void); protected: - ~ACE_Future_Rep (void); - }; /** diff --git a/ACE/ace/Get_Opt.h b/ACE/ace/Get_Opt.h index 47aa82720ac..fbe64a18a3b 100644 --- a/ACE/ace/Get_Opt.h +++ b/ACE/ace/Get_Opt.h @@ -38,7 +38,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * * This is a C++ wrapper for getopt(3c) and getopt_long(3c). */ - class ACE_Export ACE_Get_Opt { public: diff --git a/ACE/ace/Handle_Gobbler.h b/ACE/ace/Handle_Gobbler.h index 2d52e1f8791..1ce1a2982cd 100644 --- a/ACE/ace/Handle_Gobbler.h +++ b/ACE/ace/Handle_Gobbler.h @@ -34,13 +34,12 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Handle_Gobbler { public: - /// Destructor. Cleans up any remaining handles. inline ~ACE_Handle_Gobbler (void); /** - * Handles are opened continously until the process runs out of - * them, and then <n_handles_to_keep_available> handles are closed + * Handles are opened continuously until the process runs out of + * them, and then @a n_handles_to_keep_available handles are closed * (freed) thereby making them usable in the future. */ inline int consume_handles (size_t n_handles_to_keep_available); diff --git a/ACE/ace/INET_Addr.h b/ACE/ace/INET_Addr.h index 7e1ad8bcbd0..29c87f8cf55 100644 --- a/ACE/ace/INET_Addr.h +++ b/ACE/ace/INET_Addr.h @@ -345,6 +345,9 @@ public: /// Return @c true if the IP address is IPv6 linklocal address. bool is_linklocal (void) const; + /// Return @c true if the IP address is IPv6 sitelocal address. + bool is_sitelocal (void) const; + /// Return @c true if the IP address is IPv4-mapped IPv6 address. bool is_ipv4_mapped_ipv6 (void) const; diff --git a/ACE/ace/INET_Addr.inl b/ACE/ace/INET_Addr.inl index 3e7b18f3e4b..96bbb161b67 100644 --- a/ACE/ace/INET_Addr.inl +++ b/ACE/ace/INET_Addr.inl @@ -228,6 +228,16 @@ ACE_INET_Addr::is_linklocal (void) const return false; } +// Return @c true if the IP address is IPv6 sitelocal address. +ACE_INLINE bool +ACE_INET_Addr::is_sitelocal (void) const +{ + if (this->get_type () == AF_INET6) + return IN6_IS_ADDR_SITELOCAL (&this->inet_addr_.in6_.sin6_addr); + + return false; +} + // Return @c true if the IP address is IPv4 mapped IPv6 address. ACE_INLINE bool ACE_INET_Addr::is_ipv4_mapped_ipv6 (void) const diff --git a/ACE/ace/Log_Category.h b/ACE/ace/Log_Category.h index a7f11a36078..8e1d898d924 100644 --- a/ACE/ace/Log_Category.h +++ b/ACE/ace/Log_Category.h @@ -144,18 +144,17 @@ class ACE_Log_Category; * * @see ACE_Log_Categy */ - class ACE_Export ACE_Log_Category_TSS { public: ACE_Log_Category_TSS(ACE_Log_Category* category, ACE_Log_Msg* logger); - const char* name(); - unsigned int id(); + const char* name() const; + unsigned int id() const; ACE_Log_Msg* logger(); /// Get the current ACE_Log_Priority mask. - u_long priority_mask (); + u_long priority_mask () const; /// Set the ACE_Log_Priority mask, returns original mask. u_long priority_mask (u_long); @@ -233,9 +232,9 @@ private: * object would also be disabled regardless of the @c priority_mask * setting in the @c ACE_Log_Category object. * - * Each cateogry can have a name which + * Each category can have a name which * is fixed at construction. The name is not used for - * formating the messages. However, it can be used by a + * formatting the messages. However, it can be used by a * message backend object for identification and reformat * accordingly. * @@ -256,7 +255,6 @@ private: class ACE_Export ACE_Log_Category { public: - /** * Initialize the logger with a name. * @@ -271,13 +269,13 @@ public: ACE_Log_Category(const char* name); ~ACE_Log_Category(); - unsigned int id(); - const char* name(); + unsigned int id() const; + const char* name() const; ACE_Log_Category_TSS* per_thr_obj(); /// Get the process ACE_Log_Priority mask. - u_long priority_mask (); + u_long priority_mask () const; /// Set the process ACE_Log_Priority mask, returns original mask. u_long priority_mask (u_long); diff --git a/ACE/ace/Log_Category.inl b/ACE/ace/Log_Category.inl index 42fcf84dc4f..a8314bcfaed 100644 --- a/ACE/ace/Log_Category.inl +++ b/ACE/ace/Log_Category.inl @@ -2,25 +2,25 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE unsigned int -ACE_Log_Category::id() +ACE_Log_Category::id() const { return id_; } ACE_INLINE const char* -ACE_Log_Category::name () +ACE_Log_Category::name () const { return name_; } ACE_INLINE unsigned int -ACE_Log_Category_TSS::id() +ACE_Log_Category_TSS::id() const { return category_->id_; } ACE_INLINE const char* -ACE_Log_Category_TSS::name () +ACE_Log_Category_TSS::name () const { return category_->name_; } @@ -33,7 +33,7 @@ ACE_Log_Category_TSS::logger () /// Get the current ACE_Log_Priority mask. ACE_INLINE u_long -ACE_Log_Category_TSS::priority_mask () +ACE_Log_Category_TSS::priority_mask () const { return priority_mask_; } @@ -158,7 +158,7 @@ ACE_Log_Category_TSS::log_hexdump (ACE_Log_Priority priority, /// Get the current ACE_Log_Priority mask. ACE_INLINE u_long -ACE_Log_Category::priority_mask () +ACE_Log_Category::priority_mask () const { return priority_mask_; } diff --git a/ACE/ace/MEM_IO.h b/ACE/ace/MEM_IO.h index c4d7764b8e8..515f573a0c1 100644 --- a/ACE/ace/MEM_IO.h +++ b/ACE/ace/MEM_IO.h @@ -27,7 +27,6 @@ #include "ace/Process_Semaphore.h" #include "ace/Process_Mutex.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_Reactive_MEM_IO : public ACE_MEM_SAP @@ -65,7 +64,7 @@ public: const ACE_Time_Value *timeout); /** - * Convert the buffer offset <off> to absolute address to @a buf. + * Convert the buffer offset @a off to absolute address to @a buf. * Return the size of valid information containing in the @a buf, * -1 if <shm_malloc_> is not initialized. */ @@ -76,11 +75,12 @@ public: class ACE_Export ACE_MT_MEM_IO : public ACE_MEM_SAP { public: + /// Structure for a simple queue typedef struct { ACE_MEM_SAP_Node::ACE_MEM_SAP_NODE_PTR head_; ACE_MEM_SAP_Node::ACE_MEM_SAP_NODE_PTR tail_; - } MQ_Struct; // Structure for a simple queue + } MQ_Struct; class Simple_Queue { @@ -144,7 +144,7 @@ private: /** * @class ACE_MEM_IO * - * @brief Defines the methods for the ACE shared memeory wrapper I/O + * @brief Defines the methods for the ACE shared memory wrapper I/O * routines (e.g., send/recv). * The shared memory transport uses ACE_SOCK_* class to * implement the signaling mechanism so we can easily use the diff --git a/ACE/ace/MMAP_Memory_Pool.h b/ACE/ace/MMAP_Memory_Pool.h index 15af35692c0..70455ba79ec 100644 --- a/ACE/ace/MMAP_Memory_Pool.h +++ b/ACE/ace/MMAP_Memory_Pool.h @@ -245,9 +245,9 @@ protected: * SIGSEGV) will be triggered. At that point, the ACE_Sig_Handler * (which is part of the ACE_Reactor) will catch the signal and * dispatch the handle_signal() method defined here. If the SIGSEGV - * signal occurred due to the fact that the mapping wasn't uptodate + * signal occurred due to the fact that the mapping wasn't up to date * with respect to the backing store, the handler method below will - * update the mapping accordingly. When the signal handler returns, + * update the mapping accordingly. When the signal handler returns, * the instruction should be restarted and the operation should work. */ virtual int handle_signal (int signum, siginfo_t *, ucontext_t *); diff --git a/ACE/ace/Malloc.cpp b/ACE/ace/Malloc.cpp index 0984ac100a4..874b7b75bc0 100644 --- a/ACE/ace/Malloc.cpp +++ b/ACE/ace/Malloc.cpp @@ -14,11 +14,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Process-wide ACE_Allocator. ACE_Allocator *ACE_Allocator::allocator_ = 0; -// Controls whether the Allocator is deleted when we shut down (we can -// only delete it safely if we created it!) This is no longer used; -// see ACE_Allocator::instance (void). -int ACE_Allocator::delete_allocator_ = 0; - void ACE_Control_Block::ACE_Malloc_Header::dump (void) const { diff --git a/ACE/ace/Malloc_Allocator.cpp b/ACE/ace/Malloc_Allocator.cpp index 31834e3c8fa..58543303d9b 100644 --- a/ACE/ace/Malloc_Allocator.cpp +++ b/ACE/ace/Malloc_Allocator.cpp @@ -68,10 +68,8 @@ ACE_Allocator::instance (ACE_Allocator *r) *ACE_Static_Object_Lock::instance (), 0)); ACE_Allocator *t = ACE_Allocator::allocator_; - // We can't safely delete it since we don't know who created it! - ACE_Allocator::delete_allocator_ = 0; - ACE_Allocator::allocator_ = r; + return t; } @@ -79,18 +77,6 @@ void ACE_Allocator::close_singleton (void) { ACE_TRACE ("ACE_Allocator::close_singleton"); - - ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, - *ACE_Static_Object_Lock::instance ())); - - if (ACE_Allocator::delete_allocator_) - { - // This should never be executed.... See the - // ACE_Allocator::instance (void) method for an explanation. - delete ACE_Allocator::allocator_; - ACE_Allocator::allocator_ = 0; - ACE_Allocator::delete_allocator_ = 0; - } } ACE_Allocator::~ACE_Allocator (void) diff --git a/ACE/ace/Malloc_Base.h b/ACE/ace/Malloc_Base.h index b2690699226..267021ce799 100644 --- a/ACE/ace/Malloc_Base.h +++ b/ACE/ace/Malloc_Base.h @@ -39,7 +39,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_Allocator { public: - /// Unsigned integer type used for specifying memory block lengths. typedef size_t size_type; @@ -67,7 +66,7 @@ public: /// Allocate @a nbytes, giving them @a initial_value. virtual void *calloc (size_type nbytes, char initial_value = '\0') = 0; - /// Allocate <n_elem> each of size @a elem_size, giving them + /// Allocate @a n_elem each of size @a elem_size, giving them /// @a initial_value. virtual void *calloc (size_type n_elem, size_type elem_size, @@ -157,9 +156,6 @@ private: /// Pointer to a process-wide ACE_Allocator instance. static ACE_Allocator *allocator_; - - /// Must delete the <allocator_> if non-0. - static int delete_allocator_; }; /** diff --git a/ACE/ace/Malloc_T.cpp b/ACE/ace/Malloc_T.cpp index 69a6e4398f3..0f966f99c8f 100644 --- a/ACE/ace/Malloc_T.cpp +++ b/ACE/ace/Malloc_T.cpp @@ -73,9 +73,8 @@ ACE_Cached_Allocator<T, ACE_LOCK>::malloc (size_t nbytes) if (nbytes > sizeof (T)) return 0; - // addr() call is really not absolutely necessary because of the way - // ACE_Cached_Mem_Pool_Node's internal structure arranged. - return this->free_list_.remove ()->addr (); + ACE_Cached_Mem_Pool_Node<T> *allocated = this->free_list_.remove (); + return allocated == 0 ? 0 : allocated->addr(); } template <class T, class ACE_LOCK> void * @@ -86,9 +85,8 @@ ACE_Cached_Allocator<T, ACE_LOCK>::calloc (size_t nbytes, if (nbytes > sizeof (T)) return 0; - // addr() call is really not absolutely necessary because of the way - // ACE_Cached_Mem_Pool_Node's internal structure arranged. - void *ptr = this->free_list_.remove ()->addr (); + ACE_Cached_Mem_Pool_Node<T> *allocated = this->free_list_.remove (); + void *ptr = allocated == 0 ? 0 : allocated->addr(); if (ptr != 0) ACE_OS::memset (ptr, initial_value, sizeof (T)); return ptr; @@ -147,9 +145,8 @@ ACE_Dynamic_Cached_Allocator<ACE_LOCK>::malloc (size_t nbytes) if (nbytes > chunk_size_) return 0; - // addr() call is really not absolutely necessary because of the way - // ACE_Cached_Mem_Pool_Node's internal structure arranged. - return this->free_list_.remove ()->addr (); + ACE_Cached_Mem_Pool_Node<char> *allocated = this->free_list_.remove (); + return allocated == 0 ? 0 : allocated->addr(); } template <class ACE_LOCK> void * @@ -160,9 +157,8 @@ ACE_Dynamic_Cached_Allocator<ACE_LOCK>::calloc (size_t nbytes, if (nbytes > chunk_size_) return 0; - // addr() call is really not absolutely necessary because of the way - // ACE_Cached_Mem_Pool_Node's internal structure arranged. - void *ptr = this->free_list_.remove ()->addr (); + ACE_Cached_Mem_Pool_Node<char> *allocated = this->free_list_.remove (); + void *ptr = allocated == 0 ? 0 : allocated->addr(); if (ptr != 0) ACE_OS::memset (ptr, initial_value, chunk_size_); return ptr; diff --git a/ACE/ace/Managed_Object.h b/ACE/ace/Managed_Object.h index 48292bb5509..207c0abfc35 100644 --- a/ACE/ace/Managed_Object.h +++ b/ACE/ace/Managed_Object.h @@ -137,12 +137,10 @@ public: // on AIX 4.1 w/xlC v. 3.01. protected: - // Disallow instantiation of this class. ACE_UNIMPLEMENTED_FUNC (ACE_Managed_Object (void)) private: - ACE_UNIMPLEMENTED_FUNC (ACE_Managed_Object (const ACE_Managed_Object<TYPE> &)) ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Managed_Object<TYPE> &)) }; diff --git a/ACE/ace/Msg_WFMO_Reactor.h b/ACE/ace/Msg_WFMO_Reactor.h index 1440965f55e..6adb3d5d433 100644 --- a/ACE/ace/Msg_WFMO_Reactor.h +++ b/ACE/ace/Msg_WFMO_Reactor.h @@ -33,19 +33,19 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * Win32 <MsgWaitForMultipleObjects>. * * The ACE_Msg_WFMO_Reactor is an OO event demultiplexor and - * event handler Reactor. It differs from <ACE_WFMO_Reactor> by + * event handler Reactor. It differs from ACE_WFMO_Reactor by * its ability to react on Windows messages. It is needed when * the task should serve also as a COM/DCOM server. */ class ACE_Export ACE_Msg_WFMO_Reactor : public ACE_WFMO_Reactor { public: - /// Initialize <ACE_Msg_WFMO_Reactor> with the default size. + /// Initialize ACE_Msg_WFMO_Reactor with the default size. ACE_Msg_WFMO_Reactor (ACE_Sig_Handler * = 0, ACE_Timer_Queue * = 0); /** - * Initialize <ACE_Msg_WFMO_Reactor> with size @a size. Two slots will be + * Initialize ACE_Msg_WFMO_Reactor with size @a size. Two slots will be * added to the @a size parameter which will store handles used for * internal management purposes. */ diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp index db110aa5c29..749b4814cb7 100644 --- a/ACE/ace/OS_NS_Thread.cpp +++ b/ACE/ace/OS_NS_Thread.cpp @@ -27,7 +27,6 @@ ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME (void *args) ACE_VERSIONED_NAMESPACE_NAME::ACE_OS::mutex_lock_cleanup (args); } - #if !defined(ACE_WIN32) && defined (__IBMCPP__) && (__IBMCPP__ >= 400) # define ACE_BEGINTHREADEX(STACK, STACKSIZE, ENTRY_POINT, ARGS, FLAGS, THR_ID) \ (*THR_ID = ::_beginthreadex ((void(_Optlink*)(void*))ENTRY_POINT, STACK, STACKSIZE, ARGS), *THR_ID) @@ -4075,7 +4074,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func, else # endif /* ACE_HAS_MFC */ { - int start_suspended = ACE_BIT_ENABLED (flags, THR_SUSPENDED); + int const start_suspended = ACE_BIT_ENABLED (flags, THR_SUSPENDED); if (priority != ACE_DEFAULT_THREAD_PRIORITY) // If we need to set the priority, then we need to start the @@ -4105,15 +4104,6 @@ ACE_OS::thr_create (ACE_THR_FUNC func, } } } -# if 0 - *thr_handle = ::CreateThread - (0, - stacksize, - LPTHREAD_START_ROUTINE (thread_args->entry_point ()), - thread_args, - flags, - thr_id); -# endif /* 0 */ // Close down the handle if no one wants to use it. if (thr_handle == &tmp_handle && tmp_handle != 0) diff --git a/ACE/ace/OS_NS_macros.h b/ACE/ace/OS_NS_macros.h index 10a6b970575..8f94cdad952 100644 --- a/ACE/ace/OS_NS_macros.h +++ b/ACE/ace/OS_NS_macros.h @@ -67,10 +67,9 @@ #endif /* !ACE_WIN32 */ -// Helper functions to split large intergers into smaller high-order +// Helper functions to split large integers into smaller high-order // and low-order parts, and reconstitute them again. These are // required primarily for supporting _FILE_OFFSET_BITS==64 on windows. - #if defined(ACE_WIN32) # if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS==64) # include "ace/Basic_Types.h" @@ -105,8 +104,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL # endif /* _FILE_OFFSET_BITS==64 */ #endif /* ACE_WIN32 */ - - # include /**/ "ace/post.h" #endif /* ACE_OS_NS_MACROS_H */ diff --git a/ACE/ace/OS_NS_stropts.cpp b/ACE/ace/OS_NS_stropts.cpp index 64b527fcc64..bdcd3317c7f 100644 --- a/ACE/ace/OS_NS_stropts.cpp +++ b/ACE/ace/OS_NS_stropts.cpp @@ -56,12 +56,11 @@ ACE_OS::ioctl (ACE_HANDLE socket, ACE_OVERLAPPED_COMPLETION_FUNC func) { # if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) - - QOS qos; - unsigned long qos_len = sizeof (QOS); - if (io_control_code == SIO_SET_QOS) { + QOS qos; + unsigned long qos_len = sizeof (QOS); + qos.SendingFlowspec = *(ace_qos.sending_flowspec ()); qos.ReceivingFlowspec = *(ace_qos.receiving_flowspec ()); qos.ProviderSpecific = (WSABUF) ace_qos.provider_specific (); diff --git a/ACE/ace/OS_NS_sys_socket.h b/ACE/ace/OS_NS_sys_socket.h index d7e7524a6ad..faa6cd9bdfb 100644 --- a/ACE/ace/OS_NS_sys_socket.h +++ b/ACE/ace/OS_NS_sys_socket.h @@ -65,9 +65,7 @@ #endif #if defined (ACE_HAS_IPV6) -#if defined (IPV6_PKTINFO) -#define ACE_RECVPKTINFO6 IPV6_PKTINFO -#elif defined (IPV6_RECVPKTINFO) +#if defined (IPV6_RECVPKTINFO) #define ACE_RECVPKTINFO6 IPV6_RECVPKTINFO #endif #endif @@ -276,7 +274,6 @@ namespace ACE_OS int shutdown (ACE_HANDLE handle, int how); -#if defined (ACE_LINUX) && defined (ACE_HAS_IPV6) ACE_NAMESPACE_INLINE_FUNCTION unsigned int if_nametoindex (const char *ifname); @@ -288,7 +285,6 @@ namespace ACE_OS ACE_NAMESPACE_INLINE_FUNCTION void if_freenameindex (struct if_nameindex *ptr); -#endif /* ACE_LINUX && ACE_HAS_IPV6 */ /// Initialize WinSock before first use (e.g., when a DLL is first /// loaded or the first use of a socket() call. diff --git a/ACE/ace/OS_NS_sys_socket.inl b/ACE/ace/OS_NS_sys_socket.inl index 484e1f4ff00..3da4104198e 100644 --- a/ACE/ace/OS_NS_sys_socket.inl +++ b/ACE/ace/OS_NS_sys_socket.inl @@ -1020,54 +1020,52 @@ ACE_OS::socketpair (int domain, int type, #endif /* ACE_LACKS_SOCKETPAIR */ } -#if defined (ACE_LINUX) && defined (ACE_HAS_IPV6) ACE_INLINE unsigned int ACE_OS::if_nametoindex (const char *ifname) { ACE_OS_TRACE ("ACE_OS::if_nametoindex"); -#if defined (ACE_LACKS_IF_NAME_INDEX) +#ifdef ACE_LACKS_IF_NAMETOINDEX ACE_UNUSED_ARG (ifname); ACE_NOTSUP_RETURN (0); #else ACE_OSCALL_RETURN (::if_nametoindex (ifname), int, 0); -#endif /* ACE_LACKS_IF_NAME_INDEX */ +#endif /* ACE_LACKS_IF_NAMETOINDEX */ } ACE_INLINE char * ACE_OS::if_indextoname (unsigned int ifindex, char *ifname) { ACE_OS_TRACE ("ACE_OS::if_indextoname"); -#if defined (ACE_LACKS_IF_NAME_INDEX) +#ifdef ACE_LACKS_IF_NAMETOINDEX ACE_UNUSED_ARG (ifindex); ACE_UNUSED_ARG (ifname); ACE_NOTSUP_RETURN (0); #else ACE_OSCALL_RETURN (::if_indextoname (ifindex, ifname), char *, 0); -#endif /* ACE_LACKS_IF_NAME_INDEX */ +#endif /* ACE_LACKS_IF_NAMETOINDEX */ } ACE_INLINE struct if_nameindex * ACE_OS::if_nameindex (void) { ACE_OS_TRACE ("ACE_OS::if_nameindex"); -#if defined (ACE_LACKS_IF_NAME_INDEX) +#ifdef ACE_LACKS_IF_NAMEINDEX ACE_NOTSUP_RETURN (0); #else ACE_OSCALL_RETURN (::if_nameindex (), struct if_nameindex *, 0); -#endif /* ACE_LACKS_IF_NAME_INDEX */ +#endif /* ACE_LACKS_IF_NAMEINDEX */ } ACE_INLINE void ACE_OS::if_freenameindex (struct if_nameindex *ptr) { ACE_OS_TRACE ("ACE_OS::if_freenameindex"); -#if defined (ACE_LACKS_IF_NAME_INDEX) +#ifdef ACE_LACKS_IF_NAMEINDEX ACE_UNUSED_ARG (ptr); #else if (ptr != 0) ::if_freenameindex (ptr); -#endif /* ACE_LACKS_IF_NAME_INDEX */ +#endif /* ACE_LACKS_IF_NAMEINDEX */ } -#endif /* ACE_LINUX && ACE_HAS_IPV6 */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_time.inl b/ACE/ace/OS_NS_time.inl index 0249ead4b18..6bd482761ea 100644 --- a/ACE/ace/OS_NS_time.inl +++ b/ACE/ace/OS_NS_time.inl @@ -159,7 +159,7 @@ ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen) # if defined (ACE_USES_WCHAR) ACE_Ascii_To_Wide wide_buf (bufp); - ACE_OS_String::strcpy (buf, wide_buf.wchar_rep ()); + ACE_OS::strcpy (buf, wide_buf.wchar_rep ()); return buf; # else return bufp; diff --git a/ACE/ace/OS_NS_unistd.cpp b/ACE/ace/OS_NS_unistd.cpp index f316b888c51..563e385fffd 100644 --- a/ACE/ace/OS_NS_unistd.cpp +++ b/ACE/ace/OS_NS_unistd.cpp @@ -13,7 +13,9 @@ #include "ace/Object_Manager_Base.h" #include "ace/Auto_Ptr.h" #include "ace/os_include/sys/os_pstat.h" -#include "ace/os_include/sys/os_sysctl.h" +#if defined (ACE_HAS_SYSCTL) +# include "ace/os_include/sys/os_sysctl.h" +#endif /* ACE_HAS_SYSCTL */ #if defined ACE_HAS_VXCPULIB # include "vxCpuLib.h" diff --git a/ACE/ace/Object_Manager.cpp b/ACE/ace/Object_Manager.cpp index c98bec3e4bb..eb4dc69ef89 100644 --- a/ACE/ace/Object_Manager.cpp +++ b/ACE/ace/Object_Manager.cpp @@ -323,7 +323,6 @@ ACE_Object_Manager::init (void) # endif // (_MSC_VER >= 1400) // VC++ 8.0 and above. #endif /* ACE_DISABLE_WIN32_ERROR_WINDOWS */ - # if !defined (ACE_LACKS_ACE_SVCCONF) ACE_NEW_RETURN (preallocations_, ACE_Object_Manager_Preallocations, diff --git a/ACE/ace/Object_Manager.h b/ACE/ace/Object_Manager.h index f3651742e16..33171fae85e 100644 --- a/ACE/ace/Object_Manager.h +++ b/ACE/ace/Object_Manager.h @@ -236,7 +236,7 @@ public: /** * Register an ACE_Cleanup object for cleanup at process * termination. The object is deleted via the - * <ace_cleanup_destroyer>. If you need more flexiblity, see the + * <ace_cleanup_destroyer>. If you need more flexibility, see the * @c other at_exit method below. For OS's that do not have * processes, cleanup takes place at the end of <main>. Returns 0 * on success. On failure, returns -1 and sets errno to: EAGAIN if diff --git a/ACE/ace/Process_Manager.cpp b/ACE/ace/Process_Manager.cpp index ee0418b8fca..4db0f020eed 100644 --- a/ACE/ace/Process_Manager.cpp +++ b/ACE/ace/Process_Manager.cpp @@ -26,6 +26,9 @@ ACE_Process_Manager_cleanup (void *instance, void *arg) { ACE_Process_Manager::cleanup (instance, arg); } +#define ACE_PROCESS_MANAGER_CLEANUP_FUNCTION ACE_Process_Manager_cleanup +#else +#define ACE_PROCESS_MANAGER_CLEANUP_FUNCTION ACE_Process_Manager::cleanup #endif ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -124,19 +127,10 @@ ACE_Process_Manager::instance (void) // Register with the Object_Manager so that the wrapper to // delete the proactor will be called when Object_Manager is // being terminated. - -#if defined ACE_HAS_SIG_C_FUNC - ACE_Object_Manager::at_exit (ACE_Process_Manager::instance_, - ACE_Process_Manager_cleanup, - 0, - typeid (*ACE_Process_Manager::instance_).name ()); -#else ACE_Object_Manager::at_exit (ACE_Process_Manager::instance_, - ACE_Process_Manager::cleanup, + ACE_PROCESS_MANAGER_CLEANUP_FUNCTION, 0, - typeid (*ACE_Process_Manager::instance_).name ()); -#endif /* ACE_HAS_SIG_C_FUNC */ - + typeid (ACE_Process_Manager).name ()); } } @@ -157,18 +151,10 @@ ACE_Process_Manager::instance (ACE_Process_Manager *tm) // Register with the Object_Manager so that the wrapper to // delete the proactor will be called when Object_Manager is // being terminated. - -#if defined ACE_HAS_SIG_C_FUNC - ACE_Object_Manager::at_exit (ACE_Process_Manager::instance_, - ACE_Process_Manager_cleanup, - 0, - typeid (*ACE_Process_Manager::instance_).name ()); -#else ACE_Object_Manager::at_exit (ACE_Process_Manager::instance_, - ACE_Process_Manager::cleanup, - 0, - typeid (*ACE_Process_Manager::instance_).name ()); -#endif /* ACE_HAS_SIG_C_FUNC */ + ACE_PROCESS_MANAGER_CLEANUP_FUNCTION, + 0, + typeid (*t).name ()); ACE_Process_Manager::instance_ = tm; return t; diff --git a/ACE/ace/QoS/README b/ACE/ace/QoS/README index 870812aa0db..ec133bed31b 100644 --- a/ACE/ace/QoS/README +++ b/ACE/ace/QoS/README @@ -1,5 +1,3 @@ - - ACE QoS API (AQoSA) =================== diff --git a/ACE/ace/QtReactor/QtReactor.cpp b/ACE/ace/QtReactor/QtReactor.cpp index ac9fab0c903..99066b8c599 100644 --- a/ACE/ace/QtReactor/QtReactor.cpp +++ b/ACE/ace/QtReactor/QtReactor.cpp @@ -5,7 +5,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE (ACE_QtReactor) // Must be called with lock held - ACE_QtReactor::ACE_QtReactor (QApplication *qapp , ACE_Sig_Handler *sh, ACE_Timer_Queue *tq, diff --git a/ACE/ace/README b/ACE/ace/README index 68ed0bfaff6..c5d8f367908 100644 --- a/ACE/ace/README +++ b/ACE/ace/README @@ -707,28 +707,36 @@ ACE_HAS_UINT64_T Platform provides the uint64_t type. ACE_INT8_TYPE Specific type to use for ACE_INT8. If not defined, ACE will attempt to - determine the correct type. + determine the correct type + unless ACE_HAS_INT8_T has been defined ACE_INT16_TYPE Specific type to use for ACE_INT16. If not defined, ACE will attempt to - determine the correct type. + determine the correct type + unless ACE_HAS_INT16_T has been defined ACE_INT32_TYPE Specific type to use for ACE_INT32. If not defined, ACE will attempt to - determine the correct type. + determine the correct type + unless ACE_HAS_INT32_T has been defined ACE_INT64_TYPE Specific type to use for ACE_INT64. If not defined, ACE will attempt to - determine the correct type. + determine the correct type + unless ACE_HAS_INT64_T has been defined ACE_UINT8_TYPE Specific type to use for ACE_UINT8. If not defined, ACE will attempt to - determine the correct type. + determine the correct type + unless ACE_HAS_UINT8_T has been defined ACE_UINT16_TYPE Specific type to use for ACE_UINT16. If not defined, ACE will attempt to - determine the correct type. + determine the correct type + unless ACE_HAS_UINT16_T has been defined ACE_UINT32_TYPE Specific type to use for ACE_UINT32. If not defined, ACE will attempt to - determine the correct type. + determine the correct type + unless ACE_HAS_UINT32_T has been defined ACE_UINT64_TYPE Specific type to use for ACE_UINT64. If not defined, ACE will attempt to - determine the correct type. + determine the correct type + unless ACE_HAS_UINT64_T has been defined ACE_INT8_FORMAT_SPECIFIER String literal containing *printf format specifier (including the '%') @@ -1066,9 +1074,6 @@ ACE_LACKS_TIMESPEC_T Platform does not define struct timespec. ACE_LACKS_TRUNCATE Platform doesn't have truncate() (e.g., vxworks) -ACE_LACKS_U_LONGLONG_T Platform does not have - u_longlong_t typedef, and - "sun" is defined. ACE_LACKS_UALARM_PROTOTYPE Platform/compiler lacks the ualarm() prototype (e.g., Solaris) diff --git a/ACE/ace/SOCK_Dgram.cpp b/ACE/ace/SOCK_Dgram.cpp index d70d8a84b78..17b00ad015e 100644 --- a/ACE/ace/SOCK_Dgram.cpp +++ b/ACE/ace/SOCK_Dgram.cpp @@ -729,12 +729,11 @@ ACE_SOCK_Dgram::make_multicast_ifaddr6 (ipv6_mreq *ret_mreq, 0, sizeof (lmreq)); -#if defined(ACE_LINUX) +#ifndef ACE_LACKS_IF_NAMETOINDEX if (net_if != 0) { - lmreq.ipv6mr_interface = ACE_OS::if_nametoindex (ACE_TEXT_ALWAYS_CHAR(net_if)); + lmreq.ipv6mr_interface = ACE_OS::if_nametoindex (ACE_TEXT_ALWAYS_CHAR (net_if)); } - else #elif defined (ACE_WIN32) if (net_if != 0) { @@ -790,11 +789,9 @@ ACE_SOCK_Dgram::make_multicast_ifaddr6 (ipv6_mreq *ret_mreq, delete[] buf; // clean up } - else #else /* ACE_WIN32 */ ACE_UNUSED_ARG(net_if); #endif /* ACE_WIN32 */ - lmreq.ipv6mr_interface = 0; // now set the multicast address ACE_OS::memcpy (&lmreq.ipv6mr_multiaddr, @@ -807,6 +804,6 @@ ACE_SOCK_Dgram::make_multicast_ifaddr6 (ipv6_mreq *ret_mreq, return 0; } -#endif /* ACE_LINUX && ACE_HAS_IPV6 */ +#endif /* ACE_HAS_IPV6 */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/SSL/SSL_Asynch_Stream.cpp b/ACE/ace/SSL/SSL_Asynch_Stream.cpp index b493e98a750..f084c5375e7 100644 --- a/ACE/ace/SSL/SSL_Asynch_Stream.cpp +++ b/ACE/ace/SSL/SSL_Asynch_Stream.cpp @@ -256,7 +256,6 @@ ACE_SSL_Asynch_Stream::open (ACE_Handler & handler, ACE_TEXT ("- invalid handle")), -1); - // Get a proactor for/from the user. this->proactor_ = this->get_proactor (proactor, handler); this->ext_handler_ = & handler; @@ -407,8 +406,7 @@ ACE_SSL_Asynch_Stream::do_SSL_state_machine (void) { // this protected member should be called // with locked mutex_ - - int retval = this->do_SSL_handshake (); + int const retval = this->do_SSL_handshake (); if (retval == 0) // handshake in progress ? return 0; @@ -527,7 +525,7 @@ ACE_SSL_Asynch_Stream::do_SSL_handshake (void) -1); } - int status = ::SSL_get_error (this->ssl_, retval); + int const status = ::SSL_get_error (this->ssl_, retval); switch (status) { @@ -552,7 +550,6 @@ ACE_SSL_Asynch_Stream::do_SSL_handshake (void) return 1; } - bool ACE_SSL_Asynch_Stream::post_handshake_check (void) { diff --git a/ACE/ace/SSL/SSL_Asynch_Stream.h b/ACE/ace/SSL/SSL_Asynch_Stream.h index de2a9dc169b..7a965995a76 100644 --- a/ACE/ace/SSL/SSL_Asynch_Stream.h +++ b/ACE/ace/SSL/SSL_Asynch_Stream.h @@ -373,7 +373,6 @@ private: ACE_SSL_Asynch_Stream & operator= (ACE_SSL_Asynch_Stream const &); protected: - /// Stream Type ST_CLIENT/ST_SERVER Stream_Type type_; @@ -447,7 +446,6 @@ protected: /// Mutex to protect work ACE_SYNCH_MUTEX mutex_; - }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/SSL/SSL_Context.cpp b/ACE/ace/SSL/SSL_Context.cpp index bbbfb632541..e0d6530f426 100644 --- a/ACE/ace/SSL/SSL_Context.cpp +++ b/ACE/ace/SSL/SSL_Context.cpp @@ -352,7 +352,6 @@ ACE_SSL_Context::filter_versions (const char* versionlist) return 0; } - bool ACE_SSL_Context::check_host (const ACE_INET_Addr &host, SSL *peerssl) { @@ -360,7 +359,6 @@ ACE_SSL_Context::check_host (const ACE_INET_Addr &host, SSL *peerssl) this->check_context (); - int result = 0; char name[MAXHOSTNAMELEN+1]; if (peerssl == 0 || host.get_host_name (name, MAXHOSTNAMELEN) == -1) @@ -379,13 +377,13 @@ ACE_SSL_Context::check_host (const ACE_INET_Addr &host, SSL *peerssl) int flags = X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT; size_t len = ACE_OS::strlen (name); - result = ::X509_check_host (cert, name, len, flags, peerarg); + int const result = ::X509_check_host (cert, name, len, flags, peerarg); if (ACE::debug ()) { ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SSL_Context::check_host ") - ACE_TEXT ("name <%s> returns %d, peer <%s>\n"), + ACE_TEXT ("name <%C> returns %d, peer <%s>\n"), name, result, peer)); } if (peer != 0) @@ -516,7 +514,6 @@ ACE_SSL_Context::load_trusted_ca (const char* ca_file, return 0; } - int ACE_SSL_Context::private_key (const char *file_name, int type) @@ -598,8 +595,7 @@ ACE_SSL_Context::set_verify_peer (int strict, int once, int depth) { this->check_context (); - // Setup the peer verififcation mode. - + // Setup the peer verification mode. int verify_mode = SSL_VERIFY_PEER; if (once) verify_mode |= SSL_VERIFY_CLIENT_ONCE; @@ -615,7 +611,6 @@ ACE_SSL_Context::set_verify_peer (int strict, int once, int depth) ::SSL_CTX_set_verify_depth (this->context_, depth + 1); } - int ACE_SSL_Context::random_seed (const char * seed) { diff --git a/ACE/ace/SSL/SSL_SOCK.h b/ACE/ace/SSL/SSL_SOCK.h index 16e84af890f..29df1c85ce2 100644 --- a/ACE/ace/SSL/SSL_SOCK.h +++ b/ACE/ace/SSL/SSL_SOCK.h @@ -39,7 +39,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_SSL_Export ACE_SSL_SOCK : public ACE_SOCK { public: - /** * Override ACE_SOCK base class implementations with these SSL * specific ones. @@ -61,7 +60,6 @@ public: //@} protected: - /// Default constructor is private to prevent instances of this class /// from being defined. ACE_SSL_SOCK (void); @@ -73,7 +71,6 @@ protected: * ACE_SSL_SOCK pointer/reference. */ ~ACE_SSL_SOCK (void); - }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp b/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp index 0ed05b0052f..63f6d9bdc99 100644 --- a/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp +++ b/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp @@ -28,7 +28,6 @@ ACE_SSL_SOCK_Acceptor::~ACE_SSL_SOCK_Acceptor (void) ACE_TRACE ("ACE_SSL_SOCK_Acceptor::~ACE_SSL_SOCK_Acceptor"); } - int ACE_SSL_SOCK_Acceptor::ssl_accept (ACE_SSL_SOCK_Stream &new_stream, ACE_Time_Value *timeout) const diff --git a/ACE/ace/SSL/SSL_SOCK_Acceptor.h b/ACE/ace/SSL/SSL_SOCK_Acceptor.h index 83f56510005..e71226be9fe 100644 --- a/ACE/ace/SSL/SSL_SOCK_Acceptor.h +++ b/ACE/ace/SSL/SSL_SOCK_Acceptor.h @@ -49,7 +49,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_SSL_Export ACE_SSL_SOCK_Acceptor : public ACE_SSL_SOCK { public: - /// Default constructor. ACE_SSL_SOCK_Acceptor (void); @@ -175,16 +174,13 @@ public: ACE_ALLOC_HOOK_DECLARE; protected: - /// Complete SSL passive connection establishment. int ssl_accept (ACE_SSL_SOCK_Stream &new_stream, ACE_Time_Value *timeout) const; private: - /// The BSD-socket workhorse ACE_SOCK_Acceptor acceptor_; - }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/SSL/SSL_SOCK_Connector.h b/ACE/ace/SSL/SSL_SOCK_Connector.h index 4c862c9fbac..72917a0abb0 100644 --- a/ACE/ace/SSL/SSL_SOCK_Connector.h +++ b/ACE/ace/SSL/SSL_SOCK_Connector.h @@ -53,9 +53,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL */ class ACE_SSL_Export ACE_SSL_SOCK_Connector { - public: - /// Default constructor. ACE_SSL_SOCK_Connector (void); @@ -292,17 +290,14 @@ public: ACE_ALLOC_HOOK_DECLARE; protected: - /// Complete non-blocking SSL active connection. int ssl_connect (ACE_SSL_SOCK_Stream &new_stream, const ACE_Time_Value *timeout); private: - /// The class that does all of the non-secure socket connection. - /// It is default contructed, and subsequently used by connect(). + /// It is default constructed, and subsequently used by connect(). ACE_SOCK_Connector connector_; - }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/SSL/SSL_SOCK_Stream.cpp b/ACE/ace/SSL/SSL_SOCK_Stream.cpp index b8f6ba00cb8..113adf25a61 100644 --- a/ACE/ace/SSL/SSL_SOCK_Stream.cpp +++ b/ACE/ace/SSL/SSL_SOCK_Stream.cpp @@ -563,7 +563,6 @@ ACE_SSL_SOCK_Stream::get_remote_addr (ACE_Addr &addr) const // complete. Despite that fact, the SSL connection may not have // been completed. In such a case, a successful return from // get_remote_addr() would be misleading. - if (SSL_is_init_finished (this->ssl_)) { return this->ACE_SSL_SOCK::get_remote_addr (addr); diff --git a/ACE/ace/SSL/SSL_SOCK_Stream.h b/ACE/ace/SSL/SSL_SOCK_Stream.h index c9a54fe98af..ed75a132747 100644 --- a/ACE/ace/SSL/SSL_SOCK_Stream.h +++ b/ACE/ace/SSL/SSL_SOCK_Stream.h @@ -60,7 +60,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_SSL_Export ACE_SSL_SOCK_Stream : public ACE_SSL_SOCK { public: - /// Constructor /** * @param context Pointer to @c ACE_SSL_Context instance containing @@ -75,7 +74,7 @@ public: /// Destructor ~ACE_SSL_SOCK_Stream (void); - /// Send an n byte buffer to the ssl socket using the semantics of + /// Send an @a n byte buffer to the ssl socket using the semantics of /// send(3n). /** * ACE_SSL supports no flags for sending at this time. @@ -84,7 +83,7 @@ public: size_t n, int flags) const; - /// Recv an n byte buffer from the ssl socket using the semantics of + /// Recv an @a n byte buffer from the ssl socket using the semantics of /// recv(3n). /** * ACE_SSL supports MSG_PEEK, but no other flags at this time. @@ -93,17 +92,17 @@ public: size_t n, int flags) const; - /// Send an n byte buffer to the ssl socket using the semantics of + /// Send an @a n byte buffer to the ssl socket using the semantics of /// write(2). ssize_t send (const void *buf, size_t n) const; - /// Recv an n byte buffer from the ssl socket using the semantics of + /// Recv an @a n byte buffer from the ssl socket using the semantics of /// read(2). ssize_t recv (void *buf, size_t n) const; - /// Send an iovec of size n to the ssl socket. + /// Send an iovec of size @a n to the ssl socket. /** * Note that it is not possible to perform a "scattered" write with * the underlying OpenSSL implementation. As such, the expected @@ -136,8 +135,8 @@ public: const ACE_Time_Value *timeout) const; /** - * Wait up to timeout amount of time to receive up to n bytes into - * buf (uses the recv() call). If recv() times out -1 is returned + * Wait up to timeout amount of time to receive up to @a n bytes into + * @a buf (uses the recv() call). If recv() times out -1 is returned * with errno == ETIME. If it succeeds the number of bytes received * is returned. MSG_PEEK is the only supported flag. */ @@ -147,8 +146,8 @@ public: const ACE_Time_Value *timeout) const; /** - * Wait to to timeout amount of time to send up to n bytes into - * buf (uses the send() call). If send() times out + * Wait to to timeout amount of time to send up to @a n bytes into + * @a buf (uses the send() call). If send() times out * a -1 is returned with errno == ETIME. If it succeeds the * number of bytes sent is returned. */ @@ -157,8 +156,8 @@ public: const ACE_Time_Value *timeout) const; /** - * Wait up to timeout amount of time to receive up to n bytes - * into buf (uses the recv() call). If recv() times + * Wait up to timeout amount of time to receive up to @a n bytes + * into @a buf (uses the recv() call). If recv() times * out a -1 is returned with @c errno == ETIME. If it succeeds the * number of bytes received is returned. */ @@ -166,18 +165,18 @@ public: size_t n, const ACE_Time_Value *timeout) const; - /// Send n varargs messages to the connected ssl socket. + /// Send @a n varargs messages to the connected ssl socket. ssize_t send (size_t n, ...) const; - /// Recv n varargs messages to the connected ssl socket. + /// Recv @a n varargs messages to the connected ssl socket. ssize_t recv (size_t n, ...) const; - /// Send n bytes, keep trying until n are sent. + /// Send @a n bytes, keep trying until n are sent. ssize_t send_n (const void *buf, int n) const; - /// Recv n bytes, keep trying until n are received. + /// Recv @a n bytes, keep trying until @a n are received. ssize_t recv_n (void *buf, int n) const; /** @@ -185,14 +184,14 @@ public: * for recv_n(), and no flags are supported for send_n(). */ //@{ - /// Send n bytes, keep trying until n are sent. + /// Send @a n bytes, keep trying until @a n are sent. ssize_t send_n (const void *buf, int n, int flags) const; - /// Recv n bytes, keep trying until n are sent. + /// Recv @a n bytes, keep trying until @a n are sent. ssize_t recv_n (void *buf, int n, int flags) const; /** - * Try to send exactly len bytes into buf (uses the send() call). + * Try to send exactly @a len bytes into @a buf (uses the send() call). * If send() blocks for longer than timeout the number of bytes * actually sent is returned with errno == ETIME. If a timeout does * not occur, send_n() return len (i.e., the number of bytes @@ -205,7 +204,7 @@ public: size_t *bytes_transferred = 0) const; /** - * Try to send exactly len bytes into buf (uses the send() call). + * Try to send exactly @a len bytes into @a buf (uses the send() call). * If send() blocks for longer than timeout the number of bytes * actually sent is returned with errno == ETIME. If a timeout does * not occur, send_n() return len (i.e., the number of bytes @@ -217,7 +216,7 @@ public: size_t *bytes_transferred = 0) const; /** - * Try to receive exactly len bytes into buf (uses the recv() call). + * Try to receive exactly @a len bytes into @a buf (uses the recv() call). * The ACE_Time_Value indicates how long to blocking trying to * receive. If timeout == 0, the caller will block until action is * possible, else will wait until the relative time specified in @@ -259,7 +258,6 @@ public: ssize_t recvv_n (iovec iov[], size_t n) const; - /** * Selectively close endpoints. */ @@ -293,7 +291,7 @@ public: /** * Return the address of the remotely connected peer (if there is - * one), in the referenced <ACE_Addr>. Returns 0 if successful, else + * one), in the referenced ACE_Addr. Returns 0 if successful, else * -1. * * @note If the TCP connection has been completed but the SSL @@ -306,7 +304,6 @@ public: ACE_SOCK_Stream & peer (void); protected: - /// Underlying send() helper method common to all public send() /// methods. ssize_t send_i (const void *buf, @@ -321,18 +318,15 @@ protected: const ACE_Time_Value *timeout) const; private: - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_SSL_SOCK_Stream &)) ACE_UNIMPLEMENTED_FUNC (ACE_SSL_SOCK_Stream (const ACE_SSL_SOCK_Stream &)) protected: - /// The SSL session. SSL *ssl_; /// The stream which works under the ssl connection. ACE_SOCK_Stream stream_; - }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/SSL/SSL_SOCK_Stream.inl b/ACE/ace/SSL/SSL_SOCK_Stream.inl index c2a5bf2c8ba..7e9420bfb73 100644 --- a/ACE/ace/SSL/SSL_SOCK_Stream.inl +++ b/ACE/ace/SSL/SSL_SOCK_Stream.inl @@ -101,7 +101,6 @@ ACE_SSL_SOCK_Stream::recv_i (void *buf, ACE_TRACE ("ACE_SSL_SOCK_Stream::recv_i"); // NOTE: Caller must provide thread-synchronization. - int bytes_read = 0; ACE_HANDLE const handle = this->get_handle (); diff --git a/ACE/ace/SString.h b/ACE/ace/SString.h index a9cb4f0ef37..1f4f6749e83 100644 --- a/ACE/ace/SString.h +++ b/ACE/ace/SString.h @@ -56,7 +56,6 @@ template class ACE_Export ACE_String_Base_Const_Iterator<ACE_WSTRING_TYPE>; class ACE_Export ACE_NS_WString : public ACE_WString { public: - using ACE_WString::size_type; /// Default constructor. @@ -131,7 +130,6 @@ ACE_NS_WString operator + (const ACE_NS_WString &, class ACE_Export ACE_SString { public: - typedef ACE_Allocator::size_type size_type; /// No position constant diff --git a/ACE/ace/Select_Reactor_Base.cpp b/ACE/ace/Select_Reactor_Base.cpp index 62b116907d6..592e95da6e8 100644 --- a/ACE/ace/Select_Reactor_Base.cpp +++ b/ACE/ace/Select_Reactor_Base.cpp @@ -107,11 +107,10 @@ ACE_Select_Reactor_Handler_Repository::open (size_type size) // Initialize a repository of the appropriate <size>. ACE_Select_Reactor_Handler_Repository::ACE_Select_Reactor_Handler_Repository (ACE_Select_Reactor_Impl &select_reactor) - : select_reactor_ (select_reactor), + : select_reactor_ (select_reactor) #ifndef ACE_SELECT_REACTOR_BASE_USES_HASH_MAP - max_handlep1_ (0), + , max_handlep1_ (0) #endif /* !ACE_SELECT_REACTOR_BASE_USES_HASH_MAP */ - event_handlers_ () { ACE_TRACE ("ACE_Select_Reactor_Handler_Repository::ACE_Select_Reactor_Handler_Repository"); } @@ -920,7 +919,6 @@ ACE_Select_Reactor_Notify::read_notify_pipe (ACE_HANDLE handle, return -1; } - return 1; } diff --git a/ACE/ace/Sig_Handler.cpp b/ACE/ace/Sig_Handler.cpp index 577a1e43035..e91de0b4fb4 100644 --- a/ACE/ace/Sig_Handler.cpp +++ b/ACE/ace/Sig_Handler.cpp @@ -36,16 +36,14 @@ ace_sig_handlers_dispatch (int signum, siginfo_t *info, ucontext_t *context) #define ace_signal_handlers_dispatcher ACE_SignalHandler(ACE_Sig_Handlers::dispatch) #endif /* ACE_HAS_SIG_C_FUNC */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL -// Array of Event_Handlers that will handle the signals. +/// Array of Event_Handlers that will handle the signals. ACE_Event_Handler *ACE_Sig_Handler::signal_handlers_[ACE_NSIG]; -// Remembers if a signal has occurred. +/// Remembers if a signal has occurred. sig_atomic_t ACE_Sig_Handler::sig_pending_ = 0; - ACE_ALLOC_HOOK_DEFINE(ACE_Sig_Handler) ACE_Sig_Handler::~ACE_Sig_Handler (void) @@ -131,10 +129,9 @@ ACE_Sig_Handler::handler (int signum, return ACE_Sig_Handler::handler_i (signum, new_sh); } -// Register an ACE_Event_Handler along with the corresponding SIGNUM. -// This method does NOT acquire any locks, so it can be called from a -// signal handler. - +/// Register an ACE_Event_Handler along with the corresponding SIGNUM. +/// This method does NOT acquire any locks, so it can be called from a +/// signal handler. int ACE_Sig_Handler::register_handler_i (int signum, ACE_Event_Handler *new_sh, @@ -169,10 +166,9 @@ ACE_Sig_Handler::register_handler_i (int signum, return -1; } -// Register an ACE_Event_Handler along with the corresponding SIGNUM. -// This method acquires a lock, so it can't be called from a signal -// handler, e.g., <dispatch>. - +/// Register an ACE_Event_Handler along with the corresponding SIGNUM. +/// This method acquires a lock, so it can't be called from a signal +/// handler, e.g., <dispatch>. int ACE_Sig_Handler::register_handler (int signum, ACE_Event_Handler *new_sh, @@ -220,8 +216,7 @@ ACE_Sig_Handler::remove_handler_i (int signum, return new_disp->register_action (signum, old_disp); } -// Remove an ACE_Event_Handler. - +/// Remove an ACE_Event_Handler. int ACE_Sig_Handler::remove_handler (int signum, ACE_Sig_Action *new_disp, @@ -240,9 +235,8 @@ ACE_Sig_Handler::remove_handler (int signum, return -1; } -// Master dispatcher function that gets called by a signal handler and -// dispatches one handler... - +/// Master dispatcher function that gets called by a signal handler and +/// dispatches one handler... void ACE_Sig_Handler::dispatch (int signum, siginfo_t *siginfo, @@ -285,13 +279,13 @@ ACE_Sig_Handler::dispatch (int signum, // from compiling... #define ACE_MAX_SIGNAL_HANDLERS ((size_t) 20) -// Keeps track of the id that uniquely identifies each registered -// signal handler. This id can be used to cancel a timer via the -// <remove_handler> method. +/// Keeps track of the id that uniquely identifies each registered +/// signal handler. This id can be used to cancel a timer via the +/// <remove_handler> method. int ACE_Sig_Handlers::sigkey_ = 0; -// If this is true then a 3rd party library has registered a -// handler... +/// If this is true then a 3rd party library has registered a +/// handler... bool ACE_Sig_Handlers::third_party_sig_handler_ = false; // Make life easier by defining typedefs... @@ -337,9 +331,8 @@ ACE_Sig_Handlers::dump (void) const #endif /* ACE_HAS_DUMP */ } -// This is the method that does all the dirty work... The basic -// structure of this method was devised by Detlef Becker. - +/// This is the method that does all the dirty work... The basic +/// structure of this method was devised by Detlef Becker. int ACE_Sig_Handlers::register_handler (int signum, ACE_Event_Handler *new_sh, @@ -402,10 +395,10 @@ ACE_Sig_Handlers::register_handler (int signum, ACE_Sig_Adapter (new_sh, ++ACE_Sig_Handlers::sigkey_), -1); + // Add the ACE signal handler to the set of handlers for this // signal (make sure it goes before the external one if there is // one of these). - int result = ACE_Sig_Handlers_Set::instance (signum)->insert (ace_sig_adapter); if (result == -1) @@ -465,11 +458,10 @@ ACE_Sig_Handlers::register_handler (int signum, return -1; } -// Remove the ACE_Event_Handler currently associated with <signum>. -// Install the new disposition (if given) and return the previous -// disposition (if desired by the caller). Returns 0 on success and -// -1 if <signum> is invalid. - +/// Remove the ACE_Event_Handler currently associated with @a signum. +/// Install the new disposition (if given) and return the previous +/// disposition (if desired by the caller). Returns 0 on success and +// -1 if @a signum is invalid. int ACE_Sig_Handlers::remove_handler (int signum, ACE_Sig_Action *new_disp, @@ -490,7 +482,6 @@ ACE_Sig_Handlers::remove_handler (int signum, ACE_SIG_HANDLERS_ITERATOR handler_iterator (*handler_set); // Iterate through the set of handlers for this signal. - for (ACE_Event_Handler **eh; handler_iterator.next (eh) != 0; ) @@ -501,7 +492,6 @@ ACE_Sig_Handlers::remove_handler (int signum, // Remove the handler if (1) its key matches the key we've // been told to remove or (2) if we've been told to remove // *all* handlers (i.e., <sigkey> == -1). - if (sh->sigkey () == sigkey || sigkey == -1) { handler_set->remove (*eh); @@ -514,7 +504,6 @@ ACE_Sig_Handlers::remove_handler (int signum, // If there are no more handlers left for a signal then // register the new disposition or restore the default // disposition. - ACE_Sig_Action sa (SIG_DFL, (sigset_t *) 0); if (new_disp == 0) @@ -528,9 +517,8 @@ ACE_Sig_Handlers::remove_handler (int signum, return -1; } -// Master dispatcher function that gets called by a signal handler and -// dispatches *all* the handlers... - +/// Master dispatcher function that gets called by a signal handler and +/// dispatches *all* the handlers... void ACE_Sig_Handlers::dispatch (int signum, siginfo_t *siginfo, @@ -569,10 +557,9 @@ ACE_Sig_Handlers::dispatch (int signum, } } -// Return the first item in the list of handlers. Note that this will -// trivially provide the same behavior as the ACE_Sig_Handler -// version if there is only 1 handler registered! - +/// Return the first item in the list of handlers. Note that this will +/// trivially provide the same behavior as the ACE_Sig_Handler +/// version if there is only 1 handler registered! ACE_Event_Handler * ACE_Sig_Handlers::handler (int signum) { @@ -585,12 +572,11 @@ ACE_Sig_Handlers::handler (int signum) return *eh; } -// The following is a strange bit of logic that tries to give the same -// semantics as what happens in ACE_Sig_Handler when we replace the -// current signal handler with a new one. Note that if there is only -// one signal handler the behavior will be identical. If there is -// more than one handler then things get weird... - +/// The following is a strange bit of logic that tries to give the same +/// semantics as what happens in ACE_Sig_Handler when we replace the +/// current signal handler with a new one. Note that if there is only +/// one signal handler the behavior will be identical. If there is +/// more than one handler then things get weird... ACE_Event_Handler * ACE_Sig_Handlers::handler (int signum, ACE_Event_Handler *new_sh) { diff --git a/ACE/ace/Sig_Handler.h b/ACE/ace/Sig_Handler.h index e71b153fb38..1bd2a66d464 100644 --- a/ACE/ace/Sig_Handler.h +++ b/ACE/ace/Sig_Handler.h @@ -195,7 +195,7 @@ public: // = Set/get the handler associated with a particular signal. - /// Return the head of the list of <ACE_Sig_Handler>s associated with + /// Return the head of the list of ACE_Sig_Handlers associated with /// SIGNUM. virtual ACE_Event_Handler *handler (int signum); @@ -209,7 +209,7 @@ public: /** * Callback routine registered with sigaction(2) that dispatches the - * <handle_signal> method of all the pre-registered + * handle_signal() method of all the pre-registered * ACE_Event_Handlers for @a signum */ static void dispatch (int signum, siginfo_t *, ucontext_t *); diff --git a/ACE/ace/Version.h b/ACE/ace/Version.h index 42cc249bfd6..289c71e5b64 100644 --- a/ACE/ace/Version.h +++ b/ACE/ace/Version.h @@ -4,9 +4,9 @@ #define ACE_MAJOR_VERSION 6 #define ACE_MINOR_VERSION 5 -#define ACE_MICRO_VERSION 8 -#define ACE_BETA_VERSION 8 -#define ACE_VERSION "6.5.8" -#define ACE_VERSION_CODE 394504 +#define ACE_MICRO_VERSION 9 +#define ACE_BETA_VERSION 9 +#define ACE_VERSION "6.5.9" +#define ACE_VERSION_CODE 394505 #define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c)) diff --git a/ACE/ace/WFMO_Reactor.h b/ACE/ace/WFMO_Reactor.h index c9fa9431a6c..4d4dccd151f 100644 --- a/ACE/ace/WFMO_Reactor.h +++ b/ACE/ace/WFMO_Reactor.h @@ -121,7 +121,7 @@ public: /// event bool io_entry_; - /// The assosiated Event_Handler + /// The associated Event_Handler ACE_Event_Handler *event_handler_; /// The I/O handle related to the Event_Handler. This entry is @@ -307,10 +307,6 @@ public: // = Search structure operations. - /// Bind the ACE_Event_Handler * to the ACE_HANDLE. This is for - /// the simple event entry. - int bind (ACE_HANDLE, ACE_Event_Handler *); - /// Insert I/O Event_Handler entry into the system. This method /// assumes that the lock are head *before* this method is invoked. int bind_i (bool io_entry, @@ -434,14 +430,14 @@ public: void dump (void) const; protected: - /// Reference to our <WFMO_Reactor>. + /// Reference to our WFMO_Reactor. ACE_WFMO_Reactor &wfmo_reactor_; /// Maximum number of handles. size_t max_size_; /** - * Array of <ACE_HANDLEs> passed to <WaitForMultipleObjects>. This + * Array of ACE_HANDLEs passed to <WaitForMultipleObjects>. This * is not part of the structure as the handle array needs to be * passed directly to <WaitForMultipleObjects>. */ @@ -497,7 +493,7 @@ public: /// Constructor ACE_WFMO_Reactor_Notify (size_t max_notifies = 1024); - /// Initialization. @a timer_queue is stored to call <gettimeofday>. + /// Initialization. @a timer_queue is stored to call gettimeofday(). virtual int open (ACE_Reactor_Impl *wfmo_reactor, ACE_Timer_Queue *timer_queue, int disable_notify = 0); @@ -775,8 +771,8 @@ public: /** * Control whether the Reactor will handle any more incoming events or not. - * If <do_stop> == 1, the Reactor will be disabled. By default, a reactor - * is in active state and can be deactivated/reactived as wish. + * If @a do_stop == 1, the Reactor will be disabled. By default, a reactor + * is in active state and can be deactivated/reactivated as wish. */ virtual void deactivate (int do_stop); @@ -795,13 +791,13 @@ public: ACE_HANDLE event_handle = ACE_INVALID_HANDLE); /** - * Register an ACE_Event_Handler <event_handle>. @a mask specifies - * the network events that the <event_handler> is interested in. If - * <io_handle> == <ACE_INVALID_HANDLE> the <ACE_WFMO_Reactor> will + * Register an ACE_Event_Handler @a event_handle. @a mask specifies + * the network events that the @a event_handler is interested in. If + * @a io_handle == ACE_INVALID_HANDLE the ACE_WFMO_Reactor will * call the <get_handle> method of <event_handler> to extract the - * underlying I/O handle. If the <event_handle> == - * <ACE_INVALID_HANDLE>, WFMO_Reactor will create an event for - * associating it with the I/O handle. When the <event_handle> is + * underlying I/O handle. If the @a event_handle == + * ACE_INVALID_HANDLE, WFMO_Reactor will create an event for + * associating it with the I/O handle. When the @a event_handle is * signalled, the appropriate <handle_*> callback will be invoked on * the Event_Handler */ @@ -852,8 +848,8 @@ public: ACE_Sig_Action *new_disp = 0); /** - * Removes @a event_handler from the <ACE_WFMO_Reactor>. Note that - * the <ACE_WFMO_Reactor> will call the <get_handle> method of + * Removes @a event_handler from the ACE_WFMO_Reactor. Note that + * the ACE_WFMO_Reactor will call the <get_handle> method of * @a event_handler to extract the underlying handle. If @a mask == * ACE_Event_Handler::DONT_CALL then the <handle_close> method of * the @a event_handler is not invoked. Note that the @a handle can @@ -1022,8 +1018,8 @@ public: ACE_Reactor_Mask masks_to_be_deleted); /** - * Remove @a masks_to_be_deleted to the <handle>'s entry in - * WFMO_Reactor. The Event_Handler associated with <handle> must + * Remove @a masks_to_be_deleted to the @a handle's entry in + * WFMO_Reactor. The Event_Handler associated with @a handle must * already have been registered with WFMO_Reactor. */ virtual int cancel_wakeup (ACE_HANDLE handle, @@ -1076,13 +1072,13 @@ public: // = Assorted helper methods. /** - * Return the Event_Handler associated with <handle>. Return 0 if - * <handle> is not registered. + * Return the Event_Handler associated with @a handle. Return 0 if + * @a handle is not registered. */ ACE_Event_Handler *find_handler (ACE_HANDLE handle); /** - * Check to see if <handle> is associated with a valid Event_Handler + * Check to see if @a handle is associated with a valid Event_Handler * bound to @a mask. Return the @a event_handler associated with this * @a handler if @a event_handler != 0. */ diff --git a/ACE/ace/config-android.h b/ACE/ace/config-android.h index c30389f1f64..d3d89f39d5b 100644 --- a/ACE/ace/config-android.h +++ b/ACE/ace/config-android.h @@ -123,6 +123,14 @@ # endif #endif +#if ACE_ANDROID_NDK_LESS_THAN(15, 0) +# define ACE_LACKS_STRUCT_IF_NAMEINDEX +#endif + +#if ACE_ANDROID_NDK_LESS_THAN(15, 0) || __ANDROID_API__ < 24 +# define ACE_LACKS_IF_NAMEINDEX +#endif + // These were available before r18, but in r18 they are restricted to API >= 28 ¯\_(ツ)_/¯ #if __ANDROID_API__ < 28 # define ACE_LACKS_SETHOSTENT diff --git a/ACE/ace/config-face-safety.h b/ACE/ace/config-face-safety.h index adfb8ca6630..b06fed1e5b0 100644 --- a/ACE/ace/config-face-safety.h +++ b/ACE/ace/config-face-safety.h @@ -305,7 +305,8 @@ # define ACE_LACKS_FSETPOS # define ACE_LACKS_GETC # define ACE_LACKS_GETTIMEOFDAY -# define ACE_LACKS_IF_NAME_INDEX +# define ACE_LACKS_IF_NAMEINDEX +# define ACE_LACKS_IF_NAMETOINDEX # define ACE_LACKS_IOCTL # define ACE_LACKS_LOCALECONV # define ACE_LACKS_MUNMAP diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h index 95f5e4c6354..9bbc68d1d1c 100644 --- a/ACE/ace/config-g++-common.h +++ b/ACE/ace/config-g++-common.h @@ -31,16 +31,17 @@ # define ACE_HAS_NEW_NOTHROW #endif /* __GNUC__ >= 3.3 */ -#if (__GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) || defined __clang__ -# if __cplusplus > 199711L -# define ACE_HAS_CPP11 -# endif -# if __cplusplus > 201103L -# define ACE_HAS_CPP14 -# endif -# if __cplusplus > 201402L -# define ACE_HAS_CPP17 -# endif +#if __cplusplus >= 201103L +# define ACE_HAS_CPP11 +#endif +#if __cplusplus >= 201402L +# define ACE_HAS_CPP14 +#endif +#if __cplusplus >= 201703L +# define ACE_HAS_CPP17 +#endif +#if __cplusplus >= 202002L +# define ACE_HAS_CPP20 #endif #if (defined (i386) || defined (__i386__)) && !defined (ACE_SIZEOF_LONG_DOUBLE) diff --git a/ACE/ace/config-kfreebsd.h b/ACE/ace/config-kfreebsd.h index 164b06a069f..5341a54e267 100644 --- a/ACE/ace/config-kfreebsd.h +++ b/ACE/ace/config-kfreebsd.h @@ -430,9 +430,6 @@ /* */ #define ACE_LACKS_UNBUFFERED_STREAMBUF 1 -/* Define to 1 if the system lacks the type `u_long_long_t'. */ -#define ACE_LACKS_U_LONGLONG_T 1 - /* Define to 1 if platform lacks wcsnicmp(). */ #define ACE_LACKS_WCSNICMP 1 diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h index c0fb656c321..06b9e3587f7 100644 --- a/ACE/ace/config-linux-common.h +++ b/ACE/ace/config-linux-common.h @@ -45,6 +45,10 @@ # define ACE_HAS_GLIBC_2_2_3 #endif /* __GLIBC__ > 2 || __GLIBC__ === 2 && __GLIBC_MINOR__ >= 3) */ +#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 30) +# define ACE_LACKS_SYS_SYSCTL_H +#endif /* __GLIBC__ > 2 || __GLIBC__ === 2 && __GLIBC_MINOR__ >= 30) */ + #if defined (__INTEL_COMPILER) # include "ace/config-icc-common.h" #elif defined (__GNUG__) @@ -252,4 +256,4 @@ # define ACE_HAS_GETTID // See ACE_OS::thr_gettid() #endif -#endif +#endif /* ACE_CONFIG_LINUX_COMMON_H */ diff --git a/ACE/ace/config-macosx-mojave.h b/ACE/ace/config-macosx-mojave.h index 6b0164b9e33..49bea758a61 100644 --- a/ACE/ace/config-macosx-mojave.h +++ b/ACE/ace/config-macosx-mojave.h @@ -1,6 +1,12 @@ #ifndef ACE_CONFIG_MACOSX_MOJAVE_H #define ACE_CONFIG_MACOSX_MOJAVE_H +// Get access to IPV6_RECVPKTINFO +// See http://lxr.nginx.org/ident?_i=__APPLE_USE_RFC_3542 +#ifndef __APPLE_USE_RFC_3542 +#define __APPLE_USE_RFC_3542 +#endif + #include "ace/config-macosx-highsierra.h" #endif // ACE_CONFIG_MACOSX_MOJAVE_H diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h index ae5c0b0621b..21659d80cff 100644 --- a/ACE/ace/config-macros.h +++ b/ACE/ace/config-macros.h @@ -256,7 +256,7 @@ #if !defined (ACE_UNUSED_ARG) # if defined (__GNUC__) && ((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))) || (defined (__BORLANDC__) && defined (__clang__)) # define ACE_UNUSED_ARG(a) (void) (a) -# elif defined (__GNUC__) || defined (ghs) || defined (__hpux) || defined (__DECCXX) || defined (__rational__) || defined (__USLC__) || defined (ACE_RM544) || defined (__DCC__) || defined (__PGI) || defined (__TANDEM) +# elif defined (__GNUC__) || defined (ghs) || defined (__hpux) || defined (__DECCXX) || defined (__rational__) || defined (__USLC__) || defined (ACE_RM544) || defined (__DCC__) || defined (__PGI) // Some compilers complain about "statement with no effect" with (a). // This eliminates the warnings, and no code is generated for the null // conditional statement. @note that may only be true if -O is enabled, @@ -271,7 +271,7 @@ # endif /* ghs || __GNUC__ || ..... */ #endif /* !ACE_UNUSED_ARG */ -#if defined (_MSC_VER) || defined (ghs) || defined (__DECCXX) || defined(__BORLANDC__) || defined (ACE_RM544) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) || defined (__TANDEM) || (defined (__HP_aCC) && (__HP_aCC < 39000 || __HP_aCC >= 60500)) || defined (__IAR_SYSTEMS_ICC__) +#if defined (_MSC_VER) || defined (ghs) || defined (__DECCXX) || defined(__BORLANDC__) || defined (ACE_RM544) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) || (defined (__HP_aCC) && (__HP_aCC < 39000 || __HP_aCC >= 60500)) || defined (__IAR_SYSTEMS_ICC__) # define ACE_NOTREACHED(a) #else /* ghs || ..... */ # define ACE_NOTREACHED(a) a diff --git a/ACE/ace/config-qnx.h b/ACE/ace/config-qnx.h index bedcdd26e03..6fd507bad03 100644 --- a/ACE/ace/config-qnx.h +++ b/ACE/ace/config-qnx.h @@ -133,7 +133,6 @@ #define ACE_LACKS_SYS_SHM_H #define ACE_LACKS_TIMESPEC_T #define ACE_LACKS_T_ERRNO -#define ACE_LACKS_U_LONGLONG_T #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS #define ACE_HAS_SYS_SOCKIO_H 1 #define ACE_HAS_SYSCTL diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h index ea0f0d75446..88b54d708cd 100644 --- a/ACE/ace/config-win32-borland.h +++ b/ACE/ace/config-win32-borland.h @@ -145,18 +145,21 @@ # endif /* !__MT__ */ #endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */ -#if (__BORLANDC__ <= 0x740) +#if (__BORLANDC__ <= 0x750) # define ACE_LACKS_ISWCTYPE # define ACE_LACKS_ISCTYPE #endif -#if (__BORLANDC__ >= 0x640) && (__BORLANDC__ <= 0x740) +#if (__BORLANDC__ >= 0x640) && (__BORLANDC__ <= 0x750) # define ACE_LACKS_STRTOK_R #endif #if (__BORLANDC__ <= 0x740) # define ACE_LACKS_LOCALTIME_R # define ACE_LACKS_GMTIME_R +#endif + +#if (__BORLANDC__ <= 0x750) # define ACE_LACKS_ASCTIME_R #endif @@ -190,8 +193,20 @@ # define ACE_HAS_BUILTIN_BSWAP32 # define ACE_HAS_BUILTIN_BSWAP64 # define ACE_LACKS_INLINE_ASSEMBLY -#endif /* __clang__ */ +# if __cplusplus >= 201103L +# define ACE_HAS_CPP11 +# endif +# if __cplusplus >= 201402L +# define ACE_HAS_CPP14 +# endif +# if __cplusplus >= 201703L +# define ACE_HAS_CPP17 +# endif +# if __cplusplus >= 202002L +# define ACE_HAS_CPP20 +# endif +#endif /* __clang__ */ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_BORLAND_H */ diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h index c9a4cf6abb2..31b3bffd3f9 100644 --- a/ACE/ace/config-win32-common.h +++ b/ACE/ace/config-win32-common.h @@ -40,8 +40,8 @@ # define ACE_WIN64 // MPC template adds _AMD64_ but user projects not generated using MPC -// may want to use _AMD64_ as well. Ensure it's there in all cases. -# ifndef _AMD64_ +// may want to use _AMD64_ as well. Ensure it's there in all non ARM cases +# if !defined (_AMD64_) && !defined(_ARM_) && !defined(_ARM64_) # define _AMD64_ # endif @@ -55,10 +55,6 @@ # endif /* !_FILE_OFFSET_BITS */ #endif /* _WIN64 || WIN64 */ -#if !defined (_WIN32_WINNT) -# define _WIN32_WINNT 0x0501 // pretend it's at least Windows XP or Win2003 -#endif - // If the invoking procedure turned off debugging by setting NDEBUG, then // also set ACE_NDEBUG, unless the user has already set it. #if defined (NDEBUG) @@ -71,7 +67,7 @@ // be defined, if your application uses MFC. // Setting applies to : building ACE // Runtime restrictions: MFC DLLs must be installed -// Additonal notes : If both ACE_HAS_MFC and ACE_MT_SAFE are +// Additional notes : If both ACE_HAS_MFC and ACE_MT_SAFE are // defined, the MFC DLL (not the static lib) // will be used from ACE. #if !defined (ACE_HAS_MFC) @@ -566,6 +562,15 @@ # define ACE_WSOCK_VERSION 1, 1 #endif /* ACE_HAS_WINSOCK2 */ +#if _WIN32_WINNT >= 0x400 +# define ACE_HAS_WIN32_TRYLOCK +#endif +#if _WIN32_WINNT < 0x600 +# define ACE_LACKS_IF_NAMETOINDEX +#endif +#define ACE_LACKS_IF_NAMEINDEX +#define ACE_LACKS_STRUCT_IF_NAMEINDEX + // Platform supports IP multicast on Winsock 2 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) # define ACE_HAS_IP_MULTICAST @@ -574,10 +579,12 @@ #if !defined (ACE_HAS_WINCE) # define ACE_HAS_INTERLOCKED_EXCHANGEADD #endif -#define ACE_HAS_WIN32_TRYLOCK #if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_PHARLAP) -# define ACE_HAS_SIGNAL_OBJECT_AND_WAIT + +# if _WIN32_WINNT >= 0x400 +# define ACE_HAS_SIGNAL_OBJECT_AND_WAIT +# endif // If CancelIO is undefined get the updated sp2-sdk from MS # define ACE_HAS_CANCEL_IO diff --git a/ACE/ace/os_include/net/os_if.h b/ACE/ace/os_include/net/os_if.h index e3cb6842340..be467aa2b24 100644 --- a/ACE/ace/os_include/net/os_if.h +++ b/ACE/ace/os_include/net/os_if.h @@ -40,6 +40,7 @@ #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) # include /**/ <ws2tcpip.h> +# include /**/ <iphlpapi.h> #endif /* ACE_HAS_WINSOCK2 */ // Place all additions (especially function declarations) within extern "C" {} @@ -101,6 +102,10 @@ struct ifconf { # define IFF_BROADCAST 0x2 #endif /* IFF_BROADCAST */ +#if defined (ACE_LACKS_STRUCT_IF_NAMEINDEX) +struct if_nameindex { int dummy; }; +#endif + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/ACE/ace/os_include/sys/os_types.h b/ACE/ace/os_include/sys/os_types.h index 60a425b9252..94acc1d254a 100644 --- a/ACE/ace/os_include/sys/os_types.h +++ b/ACE/ace/os_include/sys/os_types.h @@ -76,8 +76,7 @@ typedef double ACE_timer_t; typedef __int64 ACE_LOFF_T; #elif (defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x700)) || \ defined (ACE_LYNXOS_MAJOR) || \ - (defined (ACE_OPENVMS) && !defined (_LARGEFILE)) || \ - defined (__TANDEM) + (defined (ACE_OPENVMS) && !defined (_LARGEFILE)) typedef long long ACE_LOFF_T; #else typedef loff_t ACE_LOFF_T; diff --git a/ACE/ace/svcconfgen.mpc b/ACE/ace/svcconfgen.mpc index c9015370953..6129aad98d2 100644 --- a/ACE/ace/svcconfgen.mpc +++ b/ACE/ace/svcconfgen.mpc @@ -4,8 +4,8 @@ project(ace_svcconf_gen) { verbatim(gnuace, local) { "Svc_Conf_y.cpp: Svc_Conf.y" "ifeq ($(notdir $(YACC)), bison)" - " $(YACC) -l -d Svc_Conf.y" - " sed -e 's/fprintf/ACE_OS::fprintf/g' \\" // Use ACE's fprintf, not library's + " $(YACC) -l -d Svc_Conf.y" + " sed -e 's/fprintf/ACE_OS::fprintf/g' \\" // Use ACE's fprintf, not library's " -e 's/\\t/ /g' \\" // Eliminate tabs (replace with 2 spaces) " -e 's/yy/ace_yy/g' \\" " -e 's/->ace_yyerrno/->yyerrno/g' \\" // This reverses the ace_ prefix where it @@ -16,18 +16,18 @@ project(ace_svcconf_gen) { " -e 's/ace_yyerror[ ]*([ ]*YY_/ace_yyerror (ACE_SVC_CONF_PARAM->yyerrno, ACE_SVC_CONF_PARAM->yylineno, YY_/g' \\" " -e 's@#include <stdio\.h>@@' \\" " -e 's/Svc_Conf\\.tab\\.c/Svc_Conf_y.cpp/g' <Svc_Conf.tab.c >$@" - " $(RM) -f Svc_Conf.tab.c Svc_Conf_y.cpp.orig" + " $(RM) -f Svc_Conf.tab.c Svc_Conf_y.cpp.orig" "else" - " @echo 'ERROR: You must use bison 1.35 or higher to process this file'" - " @/bin/false" + " @echo 'ERROR: You must use bison 1.35 or higher to process this file'" + " @/bin/false" "endif" "Svc_Conf_Token_Table.h: Svc_Conf.y Svc_Conf_y.cpp" "ifeq ($(notdir $(YACC)), bison)" - " mv Svc_Conf.tab.h Svc_Conf_Token_Table.h" + " mv Svc_Conf.tab.h Svc_Conf_Token_Table.h" "else" - " @echo 'ERROR: You must use bison 1.35 or higher to process this file'" - " @/bin/false" + " @echo 'ERROR: You must use bison 1.35 or higher to process this file'" + " @/bin/false" "endif" } } diff --git a/ACE/apps/gperf/tests/iout2_gen/.empty b/ACE/apps/gperf/tests/iout2_gen/.empty deleted file mode 100644 index eb0e403e06a..00000000000 --- a/ACE/apps/gperf/tests/iout2_gen/.empty +++ /dev/null @@ -1 +0,0 @@ -This file keeps the directory around even when using cvs update -dP diff --git a/ACE/apps/gperf/tests/iout2_gen/.gitignore b/ACE/apps/gperf/tests/iout2_gen/.gitignore new file mode 100644 index 00000000000..a4c6c6638d2 --- /dev/null +++ b/ACE/apps/gperf/tests/iout2_gen/.gitignore @@ -0,0 +1 @@ +/idl.cpp diff --git a/ACE/bin/ace-install b/ACE/bin/ace-install index 8bf684a35e0..123a3e3afeb 100755 --- a/ACE/bin/ace-install +++ b/ACE/bin/ace-install @@ -29,6 +29,8 @@ force=0 # can we do it? die=0 +# this script name without path +this_script=$(basename $0) ##################################################################### # check for install_ace options @@ -43,7 +45,7 @@ while [ $# -gt 0 ]; do -h | --help*) echo " " - echo "`basename $0` [options]" + echo "$this_script [options]" echo " " echo "options:" echo " -h, --help show brief help" @@ -83,7 +85,7 @@ while [ $# -gt 0 ]; do ;; --aceroot*) - ACE_ROOT=`echo $1 | sed -e 's/^[^=]*=//g'`; export ACE_ROOT + ACE_ROOT=$(echo $1 | sed -e 's/^[^=]*=//g'); export ACE_ROOT shift ;; @@ -103,7 +105,7 @@ while [ $# -gt 0 ]; do ;; --archive*) - ACE_ARCHIVE=`echo $1 | sed -e 's/^[^=]*=//g'`; export ACE_ARCHIVE + ACE_ARCHIVE=$(echo $1 | sed -e 's/^[^=]*=//g'); export ACE_ARCHIVE unpack=1 shift ;; @@ -111,8 +113,8 @@ while [ $# -gt 0 ]; do -p) shift if [ $# -gt 0 ]; then - ACE_HEADER=`echo $1 | cut -f 1 -d ,`; export ACE_HEADER - ACE_MAKE=`echo $1 | cut -f 2 -d ,`; export ACE_MAKE + ACE_HEADER=$(echo $1 | cut -f 1 -d ,); export ACE_HEADER + ACE_MAKE=$(echo $1 | cut -f 2 -d ,); export ACE_MAKE else echo "no header,make files specified" exit 1 @@ -122,9 +124,9 @@ while [ $# -gt 0 ]; do ;; --platform*) - stuff=`echo $1 | sed -e 's/^[^=]*=//g'` - ACE_HEADER=`echo $stuff | cut -f 1 -d ,`; export ACE_HEADER - ACE_MAKE=`echo $stuff | cut -f 2 -d ,`; export ACE_MAKE + stuff=$(echo $1 | sed -e 's/^[^=]*=//g') + ACE_HEADER=$(echo $stuff | cut -f 1 -d ,); export ACE_HEADER + ACE_MAKE=$(echo $stuff | cut -f 2 -d ,); export ACE_MAKE config=1 shift ;; @@ -145,7 +147,7 @@ while [ $# -gt 0 ]; do ;; --compile*) - ACE_OPTS=`echo $1 | sed -e 's/^[^=]*=//g'`; export ACE_OPTS + ACE_OPTS=$(echo $1 | sed -e 's/^[^=]*=//g'); export ACE_OPTS compile=1 shift ;; @@ -166,7 +168,7 @@ while [ $# -gt 0 ]; do ;; --install*) - ACE_DEST=`echo $1 | sed -e 's/^[^=]*=//g'`; export ACE_DEST + ACE_DEST=$(echo $1 | sed -e 's/^[^=]*=//g'); export ACE_DEST install=1 shift ;; @@ -183,7 +185,7 @@ while [ $# -gt 0 ]; do ;; --arch*) - ACE_ARCH=`echo $1 | sed -e 's/^[^=]*=//g'`; export ACE_ARCH + ACE_ARCH=$(echo $1 | sed -e 's/^[^=]*=//g'); export ACE_ARCH shift ;; @@ -210,32 +212,32 @@ done # sanity checks for required variables ##################################################################### -if [ $install -ne 0 -a $compile -ne 0 -a $unpack -eq 0 ]; then +if [ $install -ne 0 ] && [ $compile -ne 0 ] && [ $unpack -eq 0 ]; then echo "- No actions specified." die=1 fi -if [ $unpack -ne 0 -a $compile -ne 0 -a $config -eq 0 ] \ - || [ $unpack -ne 0 -a $install -ne 0 -a $config -eq 0 ]; then +if [ $unpack -ne 0 ] && [ $compile -ne 0 ] && [ $config -eq 0 ] \ + || [ $unpack -ne 0 ] && [ $install -ne 0 ] && [ $config -eq 0 ]; then echo "- Must set platform config options with --platform option" - echo " (`basename $0` -h for help) to unpack and compile/install" + echo " ($this_script -h for help) to unpack and compile/install" die=1 fi if [ -z "$ACE_ROOT" ]; then echo "- Must set ACE_ROOT directory before proceeding..." echo " The directory may be set with the ACE_ROOT environment" - echo " variable or the --aceroot option (`basename $0` -h for help)" + echo " variable or the --aceroot option ($this_script -h for help)" die=1 fi -if [ $install -eq 1 -a -z "$ACE_ARCH" ]; then +if [ $install -eq 1 ] && [ -z "$ACE_ARCH" ]; then # just set it to blank if we want to flatten this level of subdirectory ACE_ARCH="" fi if [ $die -ne 0 ]; then - echo "- terminating `basename $0` script" + echo "- terminating $this_script script" exit 2 fi @@ -285,7 +287,7 @@ if [ $force -eq 0 ]; then echo " " echo "Type 'yes' to proceed, anything else to exit" - read ready + read -r ready if [ "$ready" != "yes" ]; then echo "Terminating install script. Thank you for playing." echo "We have some lovely parting gifts for you. =)" @@ -302,7 +304,7 @@ if [ $unpack -ne 0 ]; then echo "Unpacking $ACE_ARCHIVE..." - cd `dirname $ACE_ROOT` + cd $(dirname $ACE_ROOT) gzip -dc $ACE_ARCHIVE | tar xvf - fi @@ -350,7 +352,7 @@ if [ $compile -ne 0 ]; then ########################################## # add ACE_ROOT/ace to LD_LIBRARY_PATH so tao_idl can find libACE.so - if [ "`uname -s`" = "HP-UX" ]; then + if [ "$(uname -s)" = "HP-UX" ]; then if [ ! -z "$SHLIB_PATH" ]; then SHLIB_PATH=$ACE_ROOT/ace:$SHLIB_PATH else @@ -389,10 +391,10 @@ if [ $install -ne 0 ]; then ########################################## # determine final target directories - ACE_VER=`head -n 1 $ACE_ROOT/VERSION.txt | sed -e 's/^[^0-9]*//' -e 's/[, ].*//'` + ACE_VER=$(head -n 1 $ACE_ROOT/VERSION.txt | sed -e 's/^[^0-9]*//' -e 's/[, ].*//') ACE_DIR="$ACE_DEST/ACE-$ACE_VER"; export ACE_DIR - TAO_VER=`head -n 1 $ACE_ROOT/TAO/VERSION.txt | sed -e 's/^[^0-9]*//' -e 's/[, ].*//'` + TAO_VER=$(head -n 1 $ACE_ROOT/TAO/VERSION.txt | sed -e 's/^[^0-9]*//' -e 's/[, ].*//') TAO_DIR="$ACE_DEST/TAO-$TAO_VER"; export ACE_DIR ########################################## @@ -438,7 +440,7 @@ if [ $install -ne 0 ]; then # copy TAO libs echo "Copying libraries..." - for f in `find . -type f -name "lib?*" -not -name "*\.dsw" -not -name "*Test*" -print`; do + for f in $(find . -type f \( -name "lib?*.so*" -o -name "lib?*.a" -o -name "lib?*.dll" -o -name "*.dylib" \) -print); do echo $f cp $f $TAO_DIR/$ACE_ARCH/lib done @@ -446,9 +448,9 @@ if [ $install -ne 0 ]; then # copy TAO executables echo "Copying executables..." - ALL_PROGS=`find orbsvcs -type f -perm /a+x -print | grep -v ".*lib.*" | grep -v ".\.pl" | grep -v test | grep -v example` - ALL_PROGS="`find utils -type f -perm /a+x -print` $ALL_PROGS" - PROGS=`echo $ALL_PROGS | tr " " "\n" | grep -v test | grep -v default.bld | grep -v README | grep -v GNUmakefile` + ALL_PROGS=$(find orbsvcs -type f -perm /a+x -print | grep -v ".*lib.*" | grep -v ".\.pl" | grep -v test | grep -v example) + ALL_PROGS="$(find utils -type f -perm /a+x -print) $ALL_PROGS" + PROGS=$(echo $ALL_PROGS | tr " " "\n" | grep -v test | grep -v default.bld | grep -v README | grep -v GNUmakefile) for f in TAO_IDL/tao_idl $PROGS; do echo $f @@ -471,9 +473,9 @@ if [ $install -ne 0 ]; then # copy ACE libs echo "Copying libraries..." - for f in `find . -type f -name "lib?*" -not -name "*\.dsw" -not -name "*Test*" -print`; do + for f in $(find . -type f \( -name "lib?*.so*" -o -name "lib?*.a" -o -name "lib?*.dll" -o -name "*.dylib" \) -print); do # only copy libs if they're not already in $TAO_DIR/$ACE_ARCH/lib - maybe_tao_lib=$TAO_DIR/$ACE_ARCH/lib/`basename $f` + maybe_tao_lib=$TAO_DIR/$ACE_ARCH/lib/$(basename $f) if [ ! -f $maybe_tao_lib ]; then echo $f cp $f $ACE_DIR/$ACE_ARCH/lib @@ -483,7 +485,7 @@ if [ $install -ne 0 ]; then # copy ACE executables echo "Copying executables..." - ACE_PROGS=apps/gperf/src/gperf + ACE_PROGS=apps/gperf/src/ace_gperf for f in $ACE_PROGS; do echo $f @@ -507,4 +509,4 @@ fi # if [ $install -ne 0 ] # that's all, folks ##################################################################### -echo "`basename $0`: done." +echo "$this_script: done." diff --git a/ACE/bin/copy-local-script.sh b/ACE/bin/copy-local-script.sh index 8b8bddf7105..6e701c9f6d0 100755 --- a/ACE/bin/copy-local-script.sh +++ b/ACE/bin/copy-local-script.sh @@ -1,7 +1,7 @@ #!/bin/sh for i in *.gz *.bz2 *.zip *.md5; do - d=`echo $i | sed 's/\.[tz][ai][rp]/-6.5.7&/'` + d=`echo $i | sed 's/\.[tz][ai][rp]/-6.5.9&/'` echo "Copying $i to $d" cp -ip $i $d done diff --git a/ACE/bin/copy-script.sh b/ACE/bin/copy-script.sh index fce27cacd97..3e84606df96 100755 --- a/ACE/bin/copy-script.sh +++ b/ACE/bin/copy-script.sh @@ -1,7 +1,7 @@ #!/bin/sh for i in *.gz *.bz2 *.zip *.md5; do - d=`echo $i | sed 's/\.[tz][ai][rp]/-6.5.7&/'` + d=`echo $i | sed 's/\.[tz][ai][rp]/-6.5.9&/'` echo "Copying $i to $d" cp -ip $i /export/www/download.dre/previous_versions/$d done diff --git a/ACE/bin/diff-builds-and-group-fixed-tests-only.sh b/ACE/bin/diff-builds-and-group-fixed-tests-only.sh index af5593bc254..7b5cad52a6f 100755 --- a/ACE/bin/diff-builds-and-group-fixed-tests-only.sh +++ b/ACE/bin/diff-builds-and-group-fixed-tests-only.sh @@ -2,7 +2,7 @@ if test -z $1; then newdate=`date -u +%Y_%m_%d`; else newdate=$1; fi if test -z $2; then prefix=`date -u +%Y%m%d%a`; else prefix=$2; fi -if test -z $3; then olddate=2020_02_10; else olddate=$3; fi +if test -z $3; then olddate=2020_05_01; else olddate=$3; fi if test -z $ACE_ROOT; then ACE_ROOT=..; fi if test -z $TAO_ROOT; then TAO_ROOT=${ACE_ROOT}/TAO; fi if test -z $CIAO_ROOT; then CIAO_ROOT=${TAO_ROOT}/CIAO; fi diff --git a/ACE/bin/make_release.py b/ACE/bin/make_release.py index 8186bdac1bc..968f31a520e 100755 --- a/ACE/bin/make_release.py +++ b/ACE/bin/make_release.py @@ -333,37 +333,6 @@ def update_debianbuild (): def update_ver (match): return match.group (1) + match.group (2) + comp_versions["ACE_version"] + match.group (4) - # find files in debian/* matching mask - for fname in listdir(dname): - match = mask.search (fname) - if match is None: - continue - - fnewname = update_ver (match) - prev_ace_ver = match.group (3) - - # if file contains lintian overrides, update file - if match.group (4) == '.lintian-overrides': - with open (dname + fname, 'r+') as lintian_overrides_file: - new_lintian_overrides = "" - for line in lintian_overrides_file.readlines (): - new_lintian_overrides += mask.sub (update_ver, line) - - if opts.take_action: - lintian_overrides_file.seek (0) - lintian_overrides_file.truncate (0) - lintian_overrides_file.writelines (new_lintian_overrides) - else: - print "New lintian-overrides file:" - print "".join (new_lintian_overrides) - - files.append (dname + fnewname) - - # rename file - print "Rename: " + dname + fname + " to " + dname + fnewname + "\n" - if opts.take_action: - ex ("git mv " + dname + fname + " " + dname + fnewname) - # update debian/control with open (dname + "control", 'r+') as control_file: new_ctrl = "" @@ -371,7 +340,7 @@ def update_debianbuild (): if re.search ("^(Package|Depends|Suggests):", line) is not None: line = mask.sub (update_ver, line) elif re.search ('^Replaces:', line) is not None: - line = line.replace (prev_ace_ver, comp_versions["ACE_version"]) + line = line.replace (old_comp_versions["ACE_version"], comp_versions["ACE_version"]) new_ctrl += line diff --git a/ACE/debian/README.source b/ACE/debian/README.source index 744eb818d06..3493f77f589 100644 --- a/ACE/debian/README.source +++ b/ACE/debian/README.source @@ -8,7 +8,7 @@ and repackaged as using uscan: $ uscan --force-download --repack --verbose --watchfile debian/watch * ACE-src-<version>.tar.gz is retrieved from: - http://download.dre.vanderbilt.edu/previous_versions/ + https://download.dre.vanderbilt.edu/previous_versions/ The -src version does not contain pre-generated Makefiles. They are regenerated in the build process. diff --git a/ACE/debian/compat b/ACE/debian/compat deleted file mode 100644 index ec635144f60..00000000000 --- a/ACE/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/ACE/debian/control b/ACE/debian/control index 57bbcd77226..2a7347d9b84 100644 --- a/ACE/debian/control +++ b/ACE/debian/control @@ -1,14 +1,14 @@ Source: ace Section: devel Priority: optional -Maintainer: Debian ACE+TAO maintainers <pkg-ace-devel@lists.alioth.debian.org> +Maintainer: Debian ACE maintainers <team+ace@tracker.debian.org> Uploaders: Thomas Girard <thomas.g.girard@free.fr>, Johnny Willemsen <jwillemsen@remedy.nl> -Build-Depends: debhelper, libssl-dev, libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), tk-dev (>= 8.5), libfox-1.6-dev, docbook-to-man, libxerces-c-dev +Build-Depends: debhelper-compat (=12), libssl-dev, libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), tk-dev (>= 8.5), libfox-1.6-dev, docbook-to-man, libxerces-c-dev Build-Depends-Indep: doxygen, graphviz -Standards-Version: 4.1.1 -Vcs-Git: git://anonscm.debian.org/pkg-ace/pkg-ace.git -Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-ace/pkg-ace.git;a=summary -Homepage: http://www.dre.vanderbilt.edu/~schmidt/ACE.html +Standards-Version: 4.5.0 +Vcs-Git: https://salsa.debian.org/debian/ace.git +Vcs-Browser: https://salsa.debian.org/debian/ace +Homepage: https://www.dre.vanderbilt.edu/~schmidt/ACE.html Package: mpc-ace Architecture: all @@ -27,7 +27,7 @@ Description: makefile, project, and workspace creator * mpc-ace: generates project files for a single target * mwc-ace: generates workspace files for a set of projects -Package: libace-6.5.8 +Package: libace-6.5.9 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -45,7 +45,7 @@ Description: C++ network programming framework Package: libace-dev Architecture: any Section: libdevel -Depends: libace-6.5.8 (= ${binary:Version}), ${misc:Depends} +Depends: libace-6.5.9 (= ${binary:Version}), ${misc:Depends} Suggests: libace-doc, pkg-config Replaces: mpc-ace (<< 5.6.3-4) Description: C++ network programming framework - development files @@ -62,7 +62,7 @@ Description: C++ network programming framework - documentation This package contains the ACE overview documentation, tutorials, examples, and information regarding upstream development. -Package: libace-ssl-6.5.8 +Package: libace-ssl-6.5.9 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -73,12 +73,12 @@ Description: ACE secure socket layer library Package: libace-ssl-dev Architecture: any Section: libdevel -Depends: libace-ssl-6.5.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends} +Depends: libace-ssl-6.5.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends} Description: ACE secure socket layer library - development files This package contains the header files and static library for the ACE SSL library. -Package: libace-rmcast-6.5.8 +Package: libace-rmcast-6.5.9 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -92,12 +92,12 @@ Description: ACE reliable multicast library Package: libace-rmcast-dev Architecture: any Section: libdevel -Depends: libace-rmcast-6.5.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-rmcast-6.5.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE reliable multicast library - development files This package contains the header files and static library for the ACE reliable multicast library. -Package: libace-tmcast-6.5.8 +Package: libace-tmcast-6.5.9 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -111,12 +111,12 @@ Description: ACE transactional multicast library Package: libace-tmcast-dev Architecture: any Section: libdevel -Depends: libace-tmcast-6.5.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-tmcast-6.5.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE transactional multicast library - development files This package contains the header files and static library for the ACE transactional multicast library. -Package: libace-htbp-6.5.8 +Package: libace-htbp-6.5.9 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -130,12 +130,12 @@ Description: ACE protocol over HTTP tunneling library Package: libace-htbp-dev Architecture: any Section: libdevel -Depends: libace-htbp-6.5.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-htbp-6.5.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE protocol over HTTP tunneling library - development files This package contains the header files and static library for the ACE HTBP library. -Package: libace-inet-6.5.8 +Package: libace-inet-6.5.9 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -146,15 +146,15 @@ Description: ACE Inet protocol library Package: libace-inet-dev Architecture: any Section: libdevel -Depends: libace-inet-6.5.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-6.5.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE Inet protocol library - development files This package contains the header files and static library for the ACE Inet protocol library. -Package: libace-inet-ssl-6.5.8 +Package: libace-inet-ssl-6.5.9 Architecture: any Section: libs -Depends: libace-inet-6.5.8, libace-ssl-6.5.8, ${shlibs:Depends}, ${misc:Depends} +Depends: libace-inet-6.5.9, libace-ssl-6.5.9, ${shlibs:Depends}, ${misc:Depends} Description: ACE SSL-enabled Inet protocol library This package provides an ACE addon library for clients (and possibly servers at some point) using Inet protocols which support SSL, such as @@ -163,7 +163,7 @@ Description: ACE SSL-enabled Inet protocol library Package: libace-inet-ssl-dev Architecture: any Section: libdevel -Depends: libace-inet-ssl-6.5.8 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-ssl-6.5.9 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends} Description: ACE SSL-enabled Inet protocol library - development files This package contains the header files and static library for the ACE SSL-enabled Inet protocol library. @@ -180,7 +180,7 @@ Description: ACE perfect hash function generator basically the same options and functionality. ace_gperf simply takes advantage of some of the features provided by the ACE library. -Package: libacexml-6.5.8 +Package: libacexml-6.5.9 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -196,12 +196,12 @@ Package: libacexml-dev Architecture: any Section: libdevel Replaces: libace-dev (<< 5.7.7-4) -Depends: libacexml-6.5.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libacexml-6.5.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE SAX based XML parsing library - development files This package contains the header files and static library for the ACE XML parsing library. -Package: libace-xml-utils-6.5.8 +Package: libace-xml-utils-6.5.9 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -215,12 +215,12 @@ Package: libace-xml-utils-dev Architecture: any Section: libdevel Replaces: libace-dev (<< 5.7.7-4) -Depends: libace-xml-utils-6.5.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev +Depends: libace-xml-utils-6.5.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev Description: ACE XML utility classes and methods - development files This package contains the header files and static library for the ACE XML Utils library -Package: libkokyu-6.5.8 +Package: libkokyu-6.5.9 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -234,12 +234,12 @@ Description: ACE scheduling and dispatching library Package: libkokyu-dev Architecture: any Section: libdevel -Depends: libkokyu-6.5.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libkokyu-6.5.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE scheduling and dispatching library - development files This package contains the header files and static library for the ACE scheduling and dispatching library. -Package: libace-xtreactor-6.5.8 +Package: libace-xtreactor-6.5.9 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -257,12 +257,12 @@ Description: ACE-GUI reactor integration for Xt Package: libace-xtreactor-dev Architecture: any Section: libdevel -Depends: libace-xtreactor-6.5.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends} +Depends: libace-xtreactor-6.5.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends} Description: ACE-GUI reactor integration for Xt - development files This package contains header files and static library for the ACE-Xt reactor integration. -Package: libace-tkreactor-6.5.8 +Package: libace-tkreactor-6.5.9 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -281,12 +281,12 @@ Description: ACE-GUI reactor integration for Tk Package: libace-tkreactor-dev Architecture: any Section: libdevel -Depends: libace-tkreactor-6.5.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends} +Depends: libace-tkreactor-6.5.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends} Description: ACE-GUI reactor integration for Tk - development files This package contains header files and static library for the ACE-Tk reactor integration. -Package: libace-flreactor-6.5.8 +Package: libace-flreactor-6.5.9 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -304,12 +304,12 @@ Description: ACE-GUI reactor integration for FLTK Package: libace-flreactor-dev Architecture: any Section: libdevel -Depends: libace-flreactor-6.5.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends} +Depends: libace-flreactor-6.5.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends} Description: ACE-GUI reactor integration for FLTK - development files This package contains header files and static library for the ACE-FLTK reactor integration. -Package: libace-foxreactor-6.5.8 +Package: libace-foxreactor-6.5.9 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -326,7 +326,7 @@ Description: ACE-GUI reactor integration for FOX Package: libace-foxreactor-dev Architecture: any Section: libdevel -Depends: libace-foxreactor-6.5.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends} +Depends: libace-foxreactor-6.5.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends} Description: ACE-GUI reactor integration for FOX - development files This package contains header files and static library for the ACE-FOX reactor integration. @@ -343,7 +343,7 @@ Description: ACE network service implementations files to link the various ACE network services together, either statically or dynamically, and form complete server programs. -Package: libnetsvcs-6.5.8 +Package: libnetsvcs-6.5.9 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -357,7 +357,7 @@ Description: ACE network service implementations - libraries Package: libnetsvcs-dev Architecture: any Section: libdevel -Depends: libnetsvcs-6.5.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libnetsvcs-6.5.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE network service implementations - development files ACE network services provide reusable components for common distributed system tasks such as logging, naming, locking, and time diff --git a/ACE/debian/copyright b/ACE/debian/copyright index 65ccfadae41..1c385528952 100644 --- a/ACE/debian/copyright +++ b/ACE/debian/copyright @@ -11,7 +11,7 @@ It is now maintained by: It was downloaded from: <http://download.dre.vanderbilt.edu/> Files: * -Copyright: © 1993-2011 Douglas C. Schmidt and his research group at +Copyright: © 1993-2019 Douglas C. Schmidt and his research group at Washington University, University of California, Irvine, and Vanderbilt University License: other-BSD diff --git a/ACE/debian/libace-6.5.8.install b/ACE/debian/libace-6.5.8.install deleted file mode 100644 index 182a5eda411..00000000000 --- a/ACE/debian/libace-6.5.8.install +++ /dev/null @@ -1,6 +0,0 @@ -usr/lib/libACE-*.so -usr/lib/libACE_ETCL-*.so -usr/lib/libACE_Monitor_Control-*.so -usr/lib/libACE_ETCL_Parser-*.so -usr/lib/libACE_RLECompression-*.so -usr/lib/libACE_Compression-*.so diff --git a/ACE/debian/libace-6.5.8.lintian-overrides b/ACE/debian/libace-6.5.8.lintian-overrides deleted file mode 100644 index ccc1f750517..00000000000 --- a/ACE/debian/libace-6.5.8.lintian-overrides +++ /dev/null @@ -1,6 +0,0 @@ -libace-6.5.8: no-symbols-control-file usr/lib/libACE-6.5.8.so -libace-6.5.8: no-symbols-control-file usr/lib/libACE_ETCL_Parser-6.5.8.so -libace-6.5.8: no-symbols-control-file usr/lib/libACE_Monitor_Control-6.5.8.so -libace-6.5.8: no-symbols-control-file usr/lib/libACE_ETCL-6.5.8.so -libace-6.5.8: no-symbols-control-file usr/lib/libACE_RLECompression-6.5.8.so -libace-6.5.8: no-symbols-control-file usr/lib/libACE_Compression-6.5.8.so diff --git a/ACE/debian/libace-6.5.8.docs b/ACE/debian/libace-VERSION.docs index ca760171412..ca760171412 100644 --- a/ACE/debian/libace-6.5.8.docs +++ b/ACE/debian/libace-VERSION.docs diff --git a/ACE/debian/libace-VERSION.install.in b/ACE/debian/libace-VERSION.install.in new file mode 100644 index 00000000000..b47b7240eaf --- /dev/null +++ b/ACE/debian/libace-VERSION.install.in @@ -0,0 +1,6 @@ +usr/lib/libACE-*.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/libACE_ETCL-*.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/libACE_Monitor_Control-*.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/libACE_ETCL_Parser-*.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/libACE_RLECompression-*.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/libACE_Compression-*.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/libace-dev.install b/ACE/debian/libace-dev.install.in index aede4930d69..389465719b1 100644 --- a/ACE/debian/libace-dev.install +++ b/ACE/debian/libace-dev.install.in @@ -11,15 +11,15 @@ usr/include/ace/*.inl usr/include/ace/*.cpp usr/include/ace/os_include usr/include/ace/Compression -usr/lib/libACE.so +usr/lib/libACE.so usr/lib/@DEB_HOST_MULTIARCH@/ usr/include/ace/ETCL/*.h usr/include/ace/ETCL/*.inl usr/include/ace/Monitor_Control/*.h -usr/lib/libACE_ETCL_Parser.so -usr/lib/libACE_Monitor_Control.so -usr/lib/libACE_ETCL.so -usr/lib/libACE_Compression.so -usr/lib/libACE_RLECompression.so -usr/lib/pkgconfig/ACE.pc -usr/lib/pkgconfig/ACE_ETCL.pc -usr/lib/pkgconfig/ACE_ETCL_Parser.pc +usr/lib/libACE_ETCL_Parser.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/libACE_Monitor_Control.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/libACE_ETCL.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/libACE_Compression.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/libACE_RLECompression.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/pkgconfig/ACE.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ +usr/lib/pkgconfig/ACE_ETCL.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ +usr/lib/pkgconfig/ACE_ETCL_Parser.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ diff --git a/ACE/debian/libace-doc.doc-base.reference b/ACE/debian/libace-doc.doc-base.reference index ec00934fb7d..b20834cb4f2 100644 --- a/ACE/debian/libace-doc.doc-base.reference +++ b/ACE/debian/libace-doc.doc-base.reference @@ -6,5 +6,5 @@ Abstract: This set of documents provides help for developing applications Section: Programming/C++ Format: html -Index: /usr/share/doc/libace-doc/index.html -Files: /usr/share/doc/libace-doc/*.html +Index: /usr/share/doc/libace-dev/index.html +Files: /usr/share/doc/libace-dev/*.html diff --git a/ACE/debian/libace-flreactor-6.5.8.install b/ACE/debian/libace-flreactor-6.5.8.install deleted file mode 100644 index 528836aacee..00000000000 --- a/ACE/debian/libace-flreactor-6.5.8.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_FlReactor-*.so diff --git a/ACE/debian/libace-flreactor-6.5.8.lintian-overrides b/ACE/debian/libace-flreactor-6.5.8.lintian-overrides deleted file mode 100644 index 65de8107df3..00000000000 --- a/ACE/debian/libace-flreactor-6.5.8.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-flreactor-6.5.8: no-symbols-control-file usr/lib/libACE_FlReactor-6.5.8.so diff --git a/ACE/debian/libace-flreactor-VERSION.install.in b/ACE/debian/libace-flreactor-VERSION.install.in new file mode 100644 index 00000000000..c49638be388 --- /dev/null +++ b/ACE/debian/libace-flreactor-VERSION.install.in @@ -0,0 +1 @@ +usr/lib/libACE_FlReactor-*.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/libace-flreactor-dev.install b/ACE/debian/libace-flreactor-dev.install deleted file mode 100644 index 4de36ed5380..00000000000 --- a/ACE/debian/libace-flreactor-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/libACE_FlReactor.so -usr/include/ace/FlReactor -usr/lib/pkgconfig/ACE_FlReactor.pc diff --git a/ACE/debian/libace-flreactor-dev.install.in b/ACE/debian/libace-flreactor-dev.install.in new file mode 100644 index 00000000000..29974e46bcd --- /dev/null +++ b/ACE/debian/libace-flreactor-dev.install.in @@ -0,0 +1,3 @@ +usr/lib/libACE_FlReactor.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/include/ace/FlReactor +usr/lib/pkgconfig/ACE_FlReactor.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ diff --git a/ACE/debian/libace-foxreactor-6.5.8.install b/ACE/debian/libace-foxreactor-6.5.8.install deleted file mode 100644 index e360f29f5af..00000000000 --- a/ACE/debian/libace-foxreactor-6.5.8.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_FoxReactor-*.so diff --git a/ACE/debian/libace-foxreactor-6.5.8.lintian-overrides b/ACE/debian/libace-foxreactor-6.5.8.lintian-overrides deleted file mode 100644 index 1366abe881b..00000000000 --- a/ACE/debian/libace-foxreactor-6.5.8.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-foxreactor-6.5.8: no-symbols-control-file usr/lib/libACE_FoxReactor-6.5.8.so diff --git a/ACE/debian/libace-foxreactor-VERSION.install.in b/ACE/debian/libace-foxreactor-VERSION.install.in new file mode 100644 index 00000000000..b2f7852a85e --- /dev/null +++ b/ACE/debian/libace-foxreactor-VERSION.install.in @@ -0,0 +1 @@ +usr/lib/libACE_FoxReactor-*.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/libace-foxreactor-dev.install b/ACE/debian/libace-foxreactor-dev.install deleted file mode 100644 index 610f74fa297..00000000000 --- a/ACE/debian/libace-foxreactor-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/libACE_FoxReactor.so -usr/include/ace/FoxReactor -usr/lib/pkgconfig/ACE_FoxReactor.pc diff --git a/ACE/debian/libace-foxreactor-dev.install.in b/ACE/debian/libace-foxreactor-dev.install.in new file mode 100644 index 00000000000..2444a2ee96b --- /dev/null +++ b/ACE/debian/libace-foxreactor-dev.install.in @@ -0,0 +1,3 @@ +usr/lib/libACE_FoxReactor.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/include/ace/FoxReactor +usr/lib/pkgconfig/ACE_FoxReactor.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ diff --git a/ACE/debian/libace-htbp-6.5.8.install b/ACE/debian/libace-htbp-6.5.8.install deleted file mode 100644 index 08103fd5cad..00000000000 --- a/ACE/debian/libace-htbp-6.5.8.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_HTBP-*.so diff --git a/ACE/debian/libace-htbp-6.5.8.lintian-overrides b/ACE/debian/libace-htbp-6.5.8.lintian-overrides deleted file mode 100644 index 30f4ac9d32e..00000000000 --- a/ACE/debian/libace-htbp-6.5.8.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-htbp-6.5.8: no-symbols-control-file usr/lib/libACE_HTBP-6.5.8.so diff --git a/ACE/debian/libace-htbp-VERSION.install.in b/ACE/debian/libace-htbp-VERSION.install.in new file mode 100644 index 00000000000..c0661044fd6 --- /dev/null +++ b/ACE/debian/libace-htbp-VERSION.install.in @@ -0,0 +1 @@ +usr/lib/libACE_HTBP-*.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/libace-htbp-dev.install b/ACE/debian/libace-htbp-dev.install deleted file mode 100644 index 4f12cdbf717..00000000000 --- a/ACE/debian/libace-htbp-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/include/ace/HTBP -usr/lib/libACE_HTBP.so -usr/lib/pkgconfig/ACE_HTBP.pc diff --git a/ACE/debian/libace-htbp-dev.install.in b/ACE/debian/libace-htbp-dev.install.in new file mode 100644 index 00000000000..27da316c2bf --- /dev/null +++ b/ACE/debian/libace-htbp-dev.install.in @@ -0,0 +1,3 @@ +usr/include/ace/HTBP +usr/lib/libACE_HTBP.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/pkgconfig/ACE_HTBP.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ diff --git a/ACE/debian/libace-inet-6.5.8.install b/ACE/debian/libace-inet-6.5.8.install deleted file mode 100644 index 59a73a509d0..00000000000 --- a/ACE/debian/libace-inet-6.5.8.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_INet-*.so diff --git a/ACE/debian/libace-inet-6.5.8.lintian-overrides b/ACE/debian/libace-inet-6.5.8.lintian-overrides deleted file mode 100644 index e49f0b41704..00000000000 --- a/ACE/debian/libace-inet-6.5.8.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -libace-inet-6.5.8: extended-description-is-probably-too-short -libace-inet-6.5.8: no-symbols-control-file usr/lib/libACE_INet-6.5.8.so diff --git a/ACE/debian/libace-inet-VERSION.install.in b/ACE/debian/libace-inet-VERSION.install.in new file mode 100644 index 00000000000..c8cddd876f2 --- /dev/null +++ b/ACE/debian/libace-inet-VERSION.install.in @@ -0,0 +1 @@ +usr/lib/libACE_INet-*.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/libace-inet-VERSION.lintian-overrides.in b/ACE/debian/libace-inet-VERSION.lintian-overrides.in new file mode 100644 index 00000000000..4c0402dc3ca --- /dev/null +++ b/ACE/debian/libace-inet-VERSION.lintian-overrides.in @@ -0,0 +1 @@ +libace-inet-@ACE_VERSION@: extended-description-is-probably-too-short diff --git a/ACE/debian/libace-inet-dev.install b/ACE/debian/libace-inet-dev.install.in index e68c7bb5479..6a98ecdaf70 100644 --- a/ACE/debian/libace-inet-dev.install +++ b/ACE/debian/libace-inet-dev.install.in @@ -1,4 +1,4 @@ -usr/lib/libACE_INet.so +usr/lib/libACE_INet.so usr/lib/@DEB_HOST_MULTIARCH@/ usr/include/ace/INet/Sock_IOStream.cpp usr/include/ace/INet/FTP_IOStream.h usr/include/ace/INet/HTTP_Request.inl @@ -63,4 +63,4 @@ usr/include/ace/INet/FTP_Response.inl usr/include/ace/INet/FTP_URL.inl usr/include/ace/INet/HTTP_StreamPolicy.h usr/include/ace/INet/Request.h -usr/lib/pkgconfig/ACE_INet.pc +usr/lib/pkgconfig/ACE_INet.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ diff --git a/ACE/debian/libace-inet-ssl-6.5.8.install b/ACE/debian/libace-inet-ssl-6.5.8.install deleted file mode 100644 index b9b8b9045f7..00000000000 --- a/ACE/debian/libace-inet-ssl-6.5.8.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_INet_SSL-*.so diff --git a/ACE/debian/libace-inet-ssl-6.5.8.lintian-overrides b/ACE/debian/libace-inet-ssl-6.5.8.lintian-overrides deleted file mode 100644 index 9bfa0863154..00000000000 --- a/ACE/debian/libace-inet-ssl-6.5.8.lintian-overrides +++ /dev/null @@ -1,4 +0,0 @@ -libace-inet-ssl-6.5.8: no-symbols-control-file usr/lib/libACE_INet_SSL-6.5.8.so - -# It's Bison-generate code covered by the GNU Bison GPL-exception -libace-inet-ssl-6.5.8: possible-gpl-code-linked-with-openssl diff --git a/ACE/debian/libace-inet-ssl-VERSION.install.in b/ACE/debian/libace-inet-ssl-VERSION.install.in new file mode 100644 index 00000000000..7646d569860 --- /dev/null +++ b/ACE/debian/libace-inet-ssl-VERSION.install.in @@ -0,0 +1 @@ +usr/lib/libACE_INet_SSL-*.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/libace-inet-ssl-VERSION.lintian-overrides.in b/ACE/debian/libace-inet-ssl-VERSION.lintian-overrides.in new file mode 100644 index 00000000000..89b9936b826 --- /dev/null +++ b/ACE/debian/libace-inet-ssl-VERSION.lintian-overrides.in @@ -0,0 +1,2 @@ +# It's Bison-generate code covered by the GNU Bison GPL-exception +libace-inet-ssl-@ACE_VERSION@: possible-gpl-code-linked-with-openssl diff --git a/ACE/debian/libace-inet-ssl-dev.install b/ACE/debian/libace-inet-ssl-dev.install deleted file mode 100644 index dfe71453638..00000000000 --- a/ACE/debian/libace-inet-ssl-dev.install +++ /dev/null @@ -1,4 +0,0 @@ -usr/include/ace/INet/*SSL* -usr/include/ace/INet/*HTTPS* -usr/lib/libACE_INet_SSL.so -usr/lib/pkgconfig/ACE_INet_SSL.pc diff --git a/ACE/debian/libace-inet-ssl-dev.install.in b/ACE/debian/libace-inet-ssl-dev.install.in new file mode 100644 index 00000000000..c386ae97bdc --- /dev/null +++ b/ACE/debian/libace-inet-ssl-dev.install.in @@ -0,0 +1,4 @@ +usr/include/ace/INet/*SSL* +usr/include/ace/INet/*HTTPS* +usr/lib/libACE_INet_SSL.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/pkgconfig/ACE_INet_SSL.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ diff --git a/ACE/debian/libace-rmcast-6.5.8.install b/ACE/debian/libace-rmcast-6.5.8.install deleted file mode 100644 index 86e78259853..00000000000 --- a/ACE/debian/libace-rmcast-6.5.8.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_RMCast-*.so diff --git a/ACE/debian/libace-rmcast-6.5.8.lintian-overrides b/ACE/debian/libace-rmcast-6.5.8.lintian-overrides deleted file mode 100644 index 3e4f8730d24..00000000000 --- a/ACE/debian/libace-rmcast-6.5.8.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-rmcast-6.5.8: no-symbols-control-file usr/lib/libACE_RMCast-6.5.8.so diff --git a/ACE/debian/libace-rmcast-VERSION.install.in b/ACE/debian/libace-rmcast-VERSION.install.in new file mode 100644 index 00000000000..d39b3033b18 --- /dev/null +++ b/ACE/debian/libace-rmcast-VERSION.install.in @@ -0,0 +1 @@ +usr/lib/libACE_RMCast-*.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/libace-rmcast-dev.install b/ACE/debian/libace-rmcast-dev.install deleted file mode 100644 index 9fffea503bc..00000000000 --- a/ACE/debian/libace-rmcast-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/include/ace/RMCast -usr/lib/libACE_RMCast.so -usr/lib/pkgconfig/ACE_RMCast.pc diff --git a/ACE/debian/libace-rmcast-dev.install.in b/ACE/debian/libace-rmcast-dev.install.in new file mode 100644 index 00000000000..c1754ecb5f1 --- /dev/null +++ b/ACE/debian/libace-rmcast-dev.install.in @@ -0,0 +1,3 @@ +usr/include/ace/RMCast +usr/lib/libACE_RMCast.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/pkgconfig/ACE_RMCast.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ diff --git a/ACE/debian/libace-ssl-6.5.8.install b/ACE/debian/libace-ssl-6.5.8.install deleted file mode 100644 index 8df45a6d55f..00000000000 --- a/ACE/debian/libace-ssl-6.5.8.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_SSL-*.so diff --git a/ACE/debian/libace-ssl-6.5.8.lintian-overrides b/ACE/debian/libace-ssl-6.5.8.lintian-overrides deleted file mode 100644 index 33779b71cd6..00000000000 --- a/ACE/debian/libace-ssl-6.5.8.lintian-overrides +++ /dev/null @@ -1,5 +0,0 @@ -libace-ssl-6.5.8: extended-description-is-probably-too-short -libace-ssl-6.5.8: no-symbols-control-file usr/lib/libACE_SSL-6.5.8.so - -# It's Bison-generate code covered by the GNU Bison GPL-exception -libace-ssl-6.5.8: possible-gpl-code-linked-with-openssl diff --git a/ACE/debian/libace-ssl-6.5.8.NEWS b/ACE/debian/libace-ssl-VERSION.NEWS index e5bd0e4aa10..e5bd0e4aa10 100644 --- a/ACE/debian/libace-ssl-6.5.8.NEWS +++ b/ACE/debian/libace-ssl-VERSION.NEWS diff --git a/ACE/debian/libace-ssl-VERSION.install.in b/ACE/debian/libace-ssl-VERSION.install.in new file mode 100644 index 00000000000..5f55d22a0ae --- /dev/null +++ b/ACE/debian/libace-ssl-VERSION.install.in @@ -0,0 +1 @@ +usr/lib/libACE_SSL-*.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/libace-ssl-VERSION.lintian-overrides.in b/ACE/debian/libace-ssl-VERSION.lintian-overrides.in new file mode 100644 index 00000000000..4081161f4ba --- /dev/null +++ b/ACE/debian/libace-ssl-VERSION.lintian-overrides.in @@ -0,0 +1,4 @@ +libace-ssl-@ACE_VERSION@: extended-description-is-probably-too-short + +# It's Bison-generate code covered by the GNU Bison GPL-exception +libace-ssl-@ACE_VERSION@: possible-gpl-code-linked-with-openssl diff --git a/ACE/debian/libace-ssl-dev.install b/ACE/debian/libace-ssl-dev.install deleted file mode 100644 index 1a1c38eb201..00000000000 --- a/ACE/debian/libace-ssl-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/include/ace/SSL -usr/lib/libACE_SSL.so -usr/lib/pkgconfig/ACE_SSL.pc diff --git a/ACE/debian/libace-ssl-dev.install.in b/ACE/debian/libace-ssl-dev.install.in new file mode 100644 index 00000000000..228d41c25f6 --- /dev/null +++ b/ACE/debian/libace-ssl-dev.install.in @@ -0,0 +1,3 @@ +usr/include/ace/SSL +usr/lib/libACE_SSL.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/pkgconfig/ACE_SSL.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ diff --git a/ACE/debian/libace-tkreactor-6.5.8.install b/ACE/debian/libace-tkreactor-6.5.8.install deleted file mode 100644 index 12ab35062d2..00000000000 --- a/ACE/debian/libace-tkreactor-6.5.8.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_TkReactor-*.so diff --git a/ACE/debian/libace-tkreactor-6.5.8.lintian-overrides b/ACE/debian/libace-tkreactor-6.5.8.lintian-overrides deleted file mode 100644 index 8c75e539987..00000000000 --- a/ACE/debian/libace-tkreactor-6.5.8.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-tkreactor-6.5.8: no-symbols-control-file usr/lib/libACE_TkReactor-6.5.8.so diff --git a/ACE/debian/libace-tkreactor-VERSION.install.in b/ACE/debian/libace-tkreactor-VERSION.install.in new file mode 100644 index 00000000000..abd630df6c1 --- /dev/null +++ b/ACE/debian/libace-tkreactor-VERSION.install.in @@ -0,0 +1 @@ +usr/lib/libACE_TkReactor-*.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/libace-tkreactor-dev.install b/ACE/debian/libace-tkreactor-dev.install deleted file mode 100644 index d61e98a09f8..00000000000 --- a/ACE/debian/libace-tkreactor-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/libACE_TkReactor.so -usr/include/ace/TkReactor -usr/lib/pkgconfig/ACE_TkReactor.pc diff --git a/ACE/debian/libace-tkreactor-dev.install.in b/ACE/debian/libace-tkreactor-dev.install.in new file mode 100644 index 00000000000..64451da14d0 --- /dev/null +++ b/ACE/debian/libace-tkreactor-dev.install.in @@ -0,0 +1,3 @@ +usr/lib/libACE_TkReactor.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/include/ace/TkReactor +usr/lib/pkgconfig/ACE_TkReactor.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ diff --git a/ACE/debian/libace-tmcast-6.5.8.install b/ACE/debian/libace-tmcast-6.5.8.install deleted file mode 100644 index e066131dea0..00000000000 --- a/ACE/debian/libace-tmcast-6.5.8.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_TMCast-*.so diff --git a/ACE/debian/libace-tmcast-6.5.8.lintian-overrides b/ACE/debian/libace-tmcast-6.5.8.lintian-overrides deleted file mode 100644 index 1a4e9135d1d..00000000000 --- a/ACE/debian/libace-tmcast-6.5.8.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-tmcast-6.5.8: no-symbols-control-file usr/lib/libACE_TMCast-6.5.8.so diff --git a/ACE/debian/libace-tmcast-VERSION.install.in b/ACE/debian/libace-tmcast-VERSION.install.in new file mode 100644 index 00000000000..b6eda852bb3 --- /dev/null +++ b/ACE/debian/libace-tmcast-VERSION.install.in @@ -0,0 +1 @@ +usr/lib/libACE_TMCast-*.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/libace-tmcast-dev.install b/ACE/debian/libace-tmcast-dev.install deleted file mode 100644 index 19eaad0d3cb..00000000000 --- a/ACE/debian/libace-tmcast-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/include/ace/TMCast -usr/lib/libACE_TMCast.so -usr/lib/pkgconfig/ACE_TMCast.pc diff --git a/ACE/debian/libace-tmcast-dev.install.in b/ACE/debian/libace-tmcast-dev.install.in new file mode 100644 index 00000000000..7c82eaff73c --- /dev/null +++ b/ACE/debian/libace-tmcast-dev.install.in @@ -0,0 +1,3 @@ +usr/include/ace/TMCast +usr/lib/libACE_TMCast.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/pkgconfig/ACE_TMCast.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ diff --git a/ACE/debian/libace-xml-utils-6.5.8.install b/ACE/debian/libace-xml-utils-6.5.8.install deleted file mode 100644 index 2428ec9f109..00000000000 --- a/ACE/debian/libace-xml-utils-6.5.8.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_XML_Utils-*.so diff --git a/ACE/debian/libace-xml-utils-6.5.8.lintian-overrides b/ACE/debian/libace-xml-utils-6.5.8.lintian-overrides deleted file mode 100644 index d63c9bc5cfa..00000000000 --- a/ACE/debian/libace-xml-utils-6.5.8.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-xml-utils-6.5.8: no-symbols-control-file usr/lib/libACE_XML_Utils-6.5.8.so diff --git a/ACE/debian/libace-xml-utils-VERSION.install.in b/ACE/debian/libace-xml-utils-VERSION.install.in new file mode 100644 index 00000000000..082320b5e97 --- /dev/null +++ b/ACE/debian/libace-xml-utils-VERSION.install.in @@ -0,0 +1 @@ +usr/lib/libACE_XML_Utils-*.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/libace-xml-utils-dev.install b/ACE/debian/libace-xml-utils-dev.install deleted file mode 100644 index b1539d17224..00000000000 --- a/ACE/debian/libace-xml-utils-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/libACE_XML_Utils.so -usr/include/ace/XML_Utils/* -usr/lib/pkgconfig/ACE_XML_Utils.pc diff --git a/ACE/debian/libace-xml-utils-dev.install.in b/ACE/debian/libace-xml-utils-dev.install.in new file mode 100644 index 00000000000..45cc54d4c02 --- /dev/null +++ b/ACE/debian/libace-xml-utils-dev.install.in @@ -0,0 +1,3 @@ +usr/lib/libACE_XML_Utils.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/include/ace/XML_Utils/* +usr/lib/pkgconfig/ACE_XML_Utils.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ diff --git a/ACE/debian/libace-xtreactor-6.5.8.install b/ACE/debian/libace-xtreactor-6.5.8.install deleted file mode 100644 index c53614c7208..00000000000 --- a/ACE/debian/libace-xtreactor-6.5.8.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_XtReactor-*.so diff --git a/ACE/debian/libace-xtreactor-6.5.8.lintian-overrides b/ACE/debian/libace-xtreactor-6.5.8.lintian-overrides deleted file mode 100644 index a3e87729442..00000000000 --- a/ACE/debian/libace-xtreactor-6.5.8.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-xtreactor-6.5.8: no-symbols-control-file usr/lib/libACE_XtReactor-6.5.8.so diff --git a/ACE/debian/libace-xtreactor-VERSION.install.in b/ACE/debian/libace-xtreactor-VERSION.install.in new file mode 100644 index 00000000000..75d4b27ef61 --- /dev/null +++ b/ACE/debian/libace-xtreactor-VERSION.install.in @@ -0,0 +1 @@ +usr/lib/libACE_XtReactor-*.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/libace-xtreactor-dev.install b/ACE/debian/libace-xtreactor-dev.install deleted file mode 100644 index b24baea6a03..00000000000 --- a/ACE/debian/libace-xtreactor-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/libACE_XtReactor.so -usr/include/ace/XtReactor -usr/lib/pkgconfig/ACE_XtReactor.pc diff --git a/ACE/debian/libace-xtreactor-dev.install.in b/ACE/debian/libace-xtreactor-dev.install.in new file mode 100644 index 00000000000..5b5b742bfaa --- /dev/null +++ b/ACE/debian/libace-xtreactor-dev.install.in @@ -0,0 +1,3 @@ +usr/lib/libACE_XtReactor.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/include/ace/XtReactor +usr/lib/pkgconfig/ACE_XtReactor.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ diff --git a/ACE/debian/libacexml-6.5.8.install b/ACE/debian/libacexml-6.5.8.install deleted file mode 100644 index d3e912ffa51..00000000000 --- a/ACE/debian/libacexml-6.5.8.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/libACEXML_XML_Svc_Conf_Parser-*.so -usr/lib/libACEXML-*.so -usr/lib/libACEXML_Parser-*.so diff --git a/ACE/debian/libacexml-6.5.8.lintian-overrides b/ACE/debian/libacexml-6.5.8.lintian-overrides deleted file mode 100644 index a9c6f75fafc..00000000000 --- a/ACE/debian/libacexml-6.5.8.lintian-overrides +++ /dev/null @@ -1,3 +0,0 @@ -libacexml-6.5.8: no-symbols-control-file usr/lib/libACEXML_Parser-6.5.8.so -libacexml-6.5.8: no-symbols-control-file usr/lib/libACEXML_XML_Svc_Conf_Parser-6.5.8.so -libacexml-6.5.8: no-symbols-control-file usr/lib/libACEXML-6.5.8.so diff --git a/ACE/debian/libacexml-6.5.8.docs b/ACE/debian/libacexml-VERSION.docs index 002855d7915..002855d7915 100644 --- a/ACE/debian/libacexml-6.5.8.docs +++ b/ACE/debian/libacexml-VERSION.docs diff --git a/ACE/debian/libacexml-VERSION.install.in b/ACE/debian/libacexml-VERSION.install.in new file mode 100644 index 00000000000..b7d27d6a1f4 --- /dev/null +++ b/ACE/debian/libacexml-VERSION.install.in @@ -0,0 +1,3 @@ +usr/lib/libACEXML_XML_Svc_Conf_Parser-*.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/libACEXML-*.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/libACEXML_Parser-*.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/libacexml-dev.install b/ACE/debian/libacexml-dev.install deleted file mode 100644 index f7ed6a74851..00000000000 --- a/ACE/debian/libacexml-dev.install +++ /dev/null @@ -1,7 +0,0 @@ -usr/include/ACEXML -usr/lib/libACEXML.so -usr/lib/libACEXML_Parser.so -usr/lib/libACEXML_XML_Svc_Conf_Parser.so -usr/lib/pkgconfig/ACEXML.pc -usr/lib/pkgconfig/ACEXML_XML_Svc_Conf_Parser.pc -usr/lib/pkgconfig/ACEXML_Parser.pc diff --git a/ACE/debian/libacexml-dev.install.in b/ACE/debian/libacexml-dev.install.in new file mode 100644 index 00000000000..4236fb6802b --- /dev/null +++ b/ACE/debian/libacexml-dev.install.in @@ -0,0 +1,7 @@ +usr/include/ACEXML +usr/lib/libACEXML.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/libACEXML_Parser.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/libACEXML_XML_Svc_Conf_Parser.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/pkgconfig/ACEXML.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ +usr/lib/pkgconfig/ACEXML_XML_Svc_Conf_Parser.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ +usr/lib/pkgconfig/ACEXML_Parser.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ diff --git a/ACE/debian/libkokyu-6.5.8.install b/ACE/debian/libkokyu-6.5.8.install deleted file mode 100644 index 62854308f96..00000000000 --- a/ACE/debian/libkokyu-6.5.8.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libKokyu-*.so diff --git a/ACE/debian/libkokyu-6.5.8.lintian-overrides b/ACE/debian/libkokyu-6.5.8.lintian-overrides deleted file mode 100644 index 87c19f0fd34..00000000000 --- a/ACE/debian/libkokyu-6.5.8.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libkokyu-6.5.8: no-symbols-control-file usr/lib/libKokyu-6.5.8.so diff --git a/ACE/debian/libkokyu-6.5.8.docs b/ACE/debian/libkokyu-VERSION.docs index e8869c513b2..e8869c513b2 100644 --- a/ACE/debian/libkokyu-6.5.8.docs +++ b/ACE/debian/libkokyu-VERSION.docs diff --git a/ACE/debian/libkokyu-VERSION.install.in b/ACE/debian/libkokyu-VERSION.install.in new file mode 100644 index 00000000000..f13089a8b0f --- /dev/null +++ b/ACE/debian/libkokyu-VERSION.install.in @@ -0,0 +1 @@ +usr/lib/libKokyu-*.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/libkokyu-dev.install b/ACE/debian/libkokyu-dev.install deleted file mode 100644 index 33ef826a07d..00000000000 --- a/ACE/debian/libkokyu-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/include/Kokyu -usr/lib/libKokyu.so -usr/lib/pkgconfig/Kokyu.pc diff --git a/ACE/debian/libkokyu-dev.install.in b/ACE/debian/libkokyu-dev.install.in new file mode 100644 index 00000000000..e86aea2bbf6 --- /dev/null +++ b/ACE/debian/libkokyu-dev.install.in @@ -0,0 +1,3 @@ +usr/include/Kokyu +usr/lib/libKokyu.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/pkgconfig/Kokyu.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ diff --git a/ACE/debian/libnetsvcs-6.5.8.install b/ACE/debian/libnetsvcs-6.5.8.install deleted file mode 100644 index c7a04b16213..00000000000 --- a/ACE/debian/libnetsvcs-6.5.8.install +++ /dev/null @@ -1 +0,0 @@ -../../netsvcs/lib/libnetsvcs-*.so usr/lib diff --git a/ACE/debian/libnetsvcs-6.5.8.lintian-overrides b/ACE/debian/libnetsvcs-6.5.8.lintian-overrides deleted file mode 100644 index 9bdc70451e8..00000000000 --- a/ACE/debian/libnetsvcs-6.5.8.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libnetsvcs-6.5.8: no-symbols-control-file usr/lib/libnetsvcs-6.5.8.so diff --git a/ACE/debian/libnetsvcs-6.5.8.docs b/ACE/debian/libnetsvcs-VERSION.docs index 0b03c55b91f..0b03c55b91f 100644 --- a/ACE/debian/libnetsvcs-6.5.8.docs +++ b/ACE/debian/libnetsvcs-VERSION.docs diff --git a/ACE/debian/libnetsvcs-VERSION.install.in b/ACE/debian/libnetsvcs-VERSION.install.in new file mode 100644 index 00000000000..36f10c3ec98 --- /dev/null +++ b/ACE/debian/libnetsvcs-VERSION.install.in @@ -0,0 +1 @@ +../../netsvcs/lib/libnetsvcs-*.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/libnetsvcs-dev.install b/ACE/debian/libnetsvcs-dev.install.in index 74d21fd30a7..d316686d81c 100644 --- a/ACE/debian/libnetsvcs-dev.install +++ b/ACE/debian/libnetsvcs-dev.install.in @@ -1,3 +1,3 @@ ../../netsvcs/lib/*.h usr/include/netsvcs ../../netsvcs/lib/*_T.cpp usr/include/netsvcs -../../netsvcs/lib/libnetsvcs.so usr/lib +../../netsvcs/lib/libnetsvcs.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/patches/90-patch-mpc-basedir.diff b/ACE/debian/patches/90-patch-mpc-basedir.diff deleted file mode 100644 index f58f9fb3323..00000000000 --- a/ACE/debian/patches/90-patch-mpc-basedir.diff +++ /dev/null @@ -1,50 +0,0 @@ -Description: make $ACE_ROOT/bin/m{w,p}c.pl relocatable - $ACE_ROOT/bin/m{w,p}c.pl look up for MPC modules under its base path, in - $ACE_ROOT/bin/MakeProjectCreator. But we package those scripts under /usr/bin, - while MakeProjectCreator folder is put under $ACE_ROOT/bin (in other words, - /usr/lib/ace/bin) - . - This patch sets MPC path dir to use $ACE_ROOT if defined (used when building - ACE+TAO packages), or /usr/lib/ace if not. -Forwarded: not-needed -Author: Thomas Girard <thomas.g.girard@free.fr> -Last-Update: 2011-07-24 - ---- a/bin/mpc.pl -+++ b/bin/mpc.pl -@@ -20,13 +20,9 @@ - use File::Spec; - use File::Basename; - --my($basePath) = (defined $FindBin::RealBin ? $FindBin::RealBin : -- File::Spec->rel2abs(dirname($0))); --if ($^O eq 'VMS') { -- $basePath = File::Spec->rel2abs(dirname($0)) if ($basePath eq ''); -- $basePath = VMS::Filespec::unixify($basePath); --} --$basePath .= '/MakeProjectCreator'; -+my($aceroot) = $ENV{ACE_ROOT}; -+my($basePath) = (defined $aceroot ? -+ $aceroot : '/usr/lib/ace') . '/bin/MakeProjectCreator'; - - my($mpcroot) = $ENV{MPC_ROOT}; - my($mpcpath) = (defined $mpcroot ? $mpcroot : ---- a/bin/mwc.pl -+++ b/bin/mwc.pl -@@ -20,13 +20,9 @@ - use File::Spec; - use File::Basename; - --my($basePath) = (defined $FindBin::RealBin ? $FindBin::RealBin : -- File::Spec->rel2abs(dirname($0))); --if ($^O eq 'VMS') { -- $basePath = File::Spec->rel2abs(dirname($0)) if ($basePath eq ''); -- $basePath = VMS::Filespec::unixify($basePath); --} --$basePath .= '/MakeProjectCreator'; -+my($aceroot) = $ENV{ACE_ROOT}; -+my($basePath) = (defined $aceroot ? -+ $aceroot : '/usr/lib/ace') . '/bin/MakeProjectCreator'; - - my($mpcroot) = $ENV{MPC_ROOT}; - my($mpcpath) = (defined $mpcroot ? $mpcroot : diff --git a/ACE/debian/patches/91-patch-dg-basedir.diff b/ACE/debian/patches/91-patch-dg-basedir.diff deleted file mode 100644 index 2c848f0ea0a..00000000000 --- a/ACE/debian/patches/91-patch-dg-basedir.diff +++ /dev/null @@ -1,29 +0,0 @@ -Description: fix path to DependencyGenerator - $ACE_ROOT/bin/depgen.pl look up for modules under its base path, in - $ACE_ROOT/bin/DependencyGenerator. - . - This patch sets base path dir to use $ACE_ROOT if defined (used when building - ACE+TAO packages), or /usr/lib/ace if not. - . - TODO: do we still need this one? -Forwarded: not-needed -Author: Thomas Girard <thomas.g.girard@free.fr> -Last-Update: 2011-07-24 - ---- a/bin/depgen.pl -+++ b/bin/depgen.pl -@@ -19,11 +19,9 @@ - use File::Spec; - use File::Basename; - --my($basePath) = $FindBin::RealBin; --if ($^O eq 'VMS') { -- $basePath = File::Spec->rel2abs(dirname($0)) if ($basePath eq ''); -- $basePath = VMS::Filespec::unixify($basePath); --} -+my($aceroot) = $ENV{ACE_ROOT}; -+my($basePath) = (defined $aceroot ? -+ $aceroot : '/usr/lib/ace') . '/bin'; - unshift(@INC, $basePath . '/DependencyGenerator'); - - my($mpcroot) = $ENV{MPC_ROOT}; diff --git a/ACE/debian/patches/92-default-ACE_ROOT.diff b/ACE/debian/patches/92-default-ACE_ROOT.diff deleted file mode 100644 index 24f289c5c90..00000000000 --- a/ACE/debian/patches/92-default-ACE_ROOT.diff +++ /dev/null @@ -1,18 +0,0 @@ -Description: define $ACE_ROOT in generated GNUmakefile if needed - TODO: not sure whether we need it. -Forwarded: no -Author: Thomas Girard <thomas.g.girard@free.fr> -Last-Update: 2010-05-24 - ---- a/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm -+++ b/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm -@@ -95,6 +95,9 @@ - "ifeq (\$(findstring k,\$(MAKEFLAGS)),k)$crlf", - " KEEP_GOING = -$crlf", - "endif$crlf$crlf", -+ "ifndef ACE_ROOT$crlf", -+ " export ACE_ROOT = /usr/lib/ace$crlf", -+ "endif$crlf", - "include \$(ACE_ROOT)/include/makeinclude/macros.GNU$crlf"; - - if ($named) { diff --git a/ACE/debian/patches/reduce-doxygen-doc.diff b/ACE/debian/patches/reduce-doxygen-doc.diff deleted file mode 100644 index 281c4eadb91..00000000000 --- a/ACE/debian/patches/reduce-doxygen-doc.diff +++ /dev/null @@ -1,127 +0,0 @@ -Description: reduce Doxygen documentation - With upstream's Doxygen settings, the generated documentation requires a huge amount of space. - Remove some detail so that it only take a reasonable amount of disk space. -Forwarded: not-needed -Author: Thomas Girard <thomas.g.girard@free.fr>, Pau Garcia i Quiles <pgquiles@elpauer.org> -Last-Update: 2014-06-29 - ---- a/etc/ace.doxygen -+++ b/etc/ace.doxygen -@@ -2136,7 +2136,7 @@ - # The default value is: YES. - # This tag requires that the tag HAVE_DOT is set to YES. - --COLLABORATION_GRAPH = YES -+COLLABORATION_GRAPH = NO - - # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for - # groups, showing the direct groups dependencies. -@@ -2288,7 +2288,7 @@ - # Minimum value: 0, maximum value: 10000, default value: 50. - # This tag requires that the tag HAVE_DOT is set to YES. - --DOT_GRAPH_MAX_NODES = 50 -+DOT_GRAPH_MAX_NODES = 15 - - # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs - # generated by dot. A depth value of 3 means that only nodes reachable from the ---- a/etc/ace_inet.doxygen -+++ b/etc/ace_inet.doxygen -@@ -2108,7 +2108,7 @@ - # The default value is: YES. - # This tag requires that the tag HAVE_DOT is set to YES. - --COLLABORATION_GRAPH = YES -+COLLABORATION_GRAPH = NO - - # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for - # groups, showing the direct groups dependencies. -@@ -2260,7 +2260,7 @@ - # Minimum value: 0, maximum value: 10000, default value: 50. - # This tag requires that the tag HAVE_DOT is set to YES. - --DOT_GRAPH_MAX_NODES = 50 -+DOT_GRAPH_MAX_NODES = 15 - - # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs - # generated by dot. A depth value of 3 means that only nodes reachable from the ---- a/etc/ace_qos.doxygen -+++ b/etc/ace_qos.doxygen -@@ -2110,7 +2110,7 @@ - # The default value is: YES. - # This tag requires that the tag HAVE_DOT is set to YES. - --COLLABORATION_GRAPH = YES -+COLLABORATION_GRAPH = NO - - # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for - # groups, showing the direct groups dependencies. -@@ -2262,7 +2262,7 @@ - # Minimum value: 0, maximum value: 10000, default value: 50. - # This tag requires that the tag HAVE_DOT is set to YES. - --DOT_GRAPH_MAX_NODES = 50 -+DOT_GRAPH_MAX_NODES = 15 - - # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs - # generated by dot. A depth value of 3 means that only nodes reachable from the ---- a/etc/ace_rmcast.doxygen -+++ b/etc/ace_rmcast.doxygen -@@ -2108,7 +2108,7 @@ - # The default value is: YES. - # This tag requires that the tag HAVE_DOT is set to YES. - --COLLABORATION_GRAPH = YES -+COLLABORATION_GRAPH = NO - - # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for - # groups, showing the direct groups dependencies. -@@ -2260,7 +2260,7 @@ - # Minimum value: 0, maximum value: 10000, default value: 50. - # This tag requires that the tag HAVE_DOT is set to YES. - --DOT_GRAPH_MAX_NODES = 50 -+DOT_GRAPH_MAX_NODES = 15 - - # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs - # generated by dot. A depth value of 3 means that only nodes reachable from the ---- a/etc/ace_ssl.doxygen -+++ b/etc/ace_ssl.doxygen -@@ -2108,7 +2108,7 @@ - # The default value is: YES. - # This tag requires that the tag HAVE_DOT is set to YES. - --COLLABORATION_GRAPH = YES -+COLLABORATION_GRAPH = NO - - # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for - # groups, showing the direct groups dependencies. -@@ -2260,7 +2260,7 @@ - # Minimum value: 0, maximum value: 10000, default value: 50. - # This tag requires that the tag HAVE_DOT is set to YES. - --DOT_GRAPH_MAX_NODES = 50 -+DOT_GRAPH_MAX_NODES = 15 - - # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs - # generated by dot. A depth value of 3 means that only nodes reachable from the ---- a/etc/acexml.doxygen -+++ b/etc/acexml.doxygen -@@ -2109,7 +2109,7 @@ - # The default value is: YES. - # This tag requires that the tag HAVE_DOT is set to YES. - --COLLABORATION_GRAPH = YES -+COLLABORATION_GRAPH = NO - - # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for - # groups, showing the direct groups dependencies. -@@ -2261,7 +2261,7 @@ - # Minimum value: 0, maximum value: 10000, default value: 50. - # This tag requires that the tag HAVE_DOT is set to YES. - --DOT_GRAPH_MAX_NODES = 50 -+DOT_GRAPH_MAX_NODES = 15 - - # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs - # generated by dot. A depth value of 3 means that only nodes reachable from the diff --git a/ACE/debian/patches/series b/ACE/debian/patches/series deleted file mode 100644 index ab8b3888dc8..00000000000 --- a/ACE/debian/patches/series +++ /dev/null @@ -1,4 +0,0 @@ -reduce-doxygen-doc.diff -90-patch-mpc-basedir.diff -91-patch-dg-basedir.diff -92-default-ACE_ROOT.diff diff --git a/ACE/debian/rules b/ACE/debian/rules index eb20a4e2112..62b2c3b5f91 100755 --- a/ACE/debian/rules +++ b/ACE/debian/rules @@ -12,8 +12,9 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+format,+fortify,+stackprotector,+relro,+bindnow DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk -CFLAGS+=$(CPPFLAGS) -CXXFLAGS+=$(CPPFLAGS) +export DEB_CFLAGS_MAINT_APPEND = $(CPPFLAGS) +export DEB_CXXFLAGS_MAINT_APPEND = $(CPPFLAGS) +export DEB_CPPFLAGS_MAINT_APPEND = -g MWCFLAGS := -type gnuace -noreldefs DSO_MAKE_FLAG := versioned_so=2 @@ -34,20 +35,30 @@ ALL_ACEXML := $(filter libacexml%,$(ALL_PACKAGES)) export ACE_ROOT := $(shell pwd) export MPC_ROOT := $(ACE_ROOT)/MPC -export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(ACE_ROOT)/lib ACE_MAJOR_VERSION := $(shell awk '/ACE_MAJOR_VERSION/ { print $$3 }' ${ACE_ROOT}/ace/Version.h) ACE_MINOR_VERSION := $(shell awk '/ACE_MINOR_VERSION/ { print $$3 }' ${ACE_ROOT}/ace/Version.h) ACE_MICRO_VERSION := $(shell awk '/ACE_MICRO_VERSION/ { print $$3 }' ${ACE_ROOT}/ace/Version.h) +ACE_VERSION = ${ACE_MAJOR_VERSION}.${ACE_MINOR_VERSION}.${ACE_MICRO_VERSION} %: dh $@ # Implement our own configure machinery; it will copy Debian specific # configuration before launching MPC to generate ACE+TAO GNUmakefile +# fname1=echo $$fname; \ .PHONY: configure configure: configure-stamp configure-stamp: + for fname in debian/*VERSION*; do \ + cp $$fname $$(echo $$fname | \ + sed -e 's/VERSION/${ACE_VERSION}/'); done + for flname in debian/*.install.in; do \ + sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' \ + $$flname > $${flname%.in}; done + for flname in debian/*.lintian-overrides.in; do \ + sed 's/@ACE_VERSION@/${ACE_VERSION}/g' \ + $$flname > $${flname%.in}; done cp debian/platform_macros.GNU $(ACE_ROOT)/include/makeinclude cp debian/config*.h $(ACE_ROOT)/ace/ cp debian/default.features $(ACE_ROOT)/bin/MakeProjectCreator/config @@ -90,10 +101,6 @@ override_dh_auto_clean: override_dh_compress: dh_compress -Xexamples -# Add --list-missing to make sure we don't miss new binaries -override_dh_install: - dh_install --list-missing - # ACE+TAO has different changelogs. Use the right one in every package. override_dh_installchangelogs: dh_installchangelogs -pmpc-ace MPC/ChangeLog diff --git a/ACE/debian/source/lintian-overrides b/ACE/debian/source/lintian-overrides deleted file mode 100644 index 721df3d38a3..00000000000 --- a/ACE/debian/source/lintian-overrides +++ /dev/null @@ -1,3 +0,0 @@ -# We are using a compat level marked as experimental -# (compat=9 in debhelper >= 8.1.3) -ace source: package-needs-versioned-debhelper-build-depends 9 diff --git a/ACE/docs/Download.html b/ACE/docs/Download.html index d6923b5e793..ea8eb370d64 100644 --- a/ACE/docs/Download.html +++ b/ACE/docs/Download.html @@ -15,14 +15,14 @@ Welcome to the download page for ACE, TAO, CIAO, and DAnCE which are open-source middleware developed by the <A -HREF="http://www.dre.vanderbilt.edu/">DOC group</a> that provide that +HREF="https://www.dre.vanderbilt.edu/">DOC group</a> that provide that following capabilities: <P> -<LI><A HREF="http://www.dre.vanderbilt.edu/~schmidt/ACE.html">ACE</A> is an +<LI><A HREF="https://www.dre.vanderbilt.edu/~schmidt/ACE.html">ACE</A> is an open-source framework that provides many components and <A -HREF="http://www.dre.vanderbilt.edu/~schmidt/POSA">patterns</A> for +HREF="https://www.dre.vanderbilt.edu/~schmidt/POSA">patterns</A> for developing high-performance, distributed real-time and embedded systems. ACE provides powerful, yet efficient abstractions for sockets, demultiplexing loops, threads, synchronization primitives. @@ -30,9 +30,9 @@ sockets, demultiplexing loops, threads, synchronization primitives. <P> -<LI><A HREF="http://www.dre.vanderbilt.edu/~schmidt/TAO.html">TAO</A> (The ACE +<LI><A HREF="https://www.dre.vanderbilt.edu/~schmidt/TAO.html">TAO</A> (The ACE ORB) is an open-source implementation of a <A -href="http://www.dre.vanderbilt.edu/~schmidt/corba.html">CORBA</A> Object +href="https://www.dre.vanderbilt.edu/~schmidt/corba.html">CORBA</A> Object Request Broker (ORB) built using components and patterns in the ACE framework. @@ -40,13 +40,13 @@ framework. <P> -<LI><A HREF="http://www.dre.vanderbilt.edu/~schmidt/CIAO.html">CIAO</a> +<LI><A HREF="https://www.dre.vanderbilt.edu/~schmidt/CIAO.html">CIAO</a> (Component Integrated ACE ORB) is an open-source implementation of the CORBA Component Model (CCM) built on top of TAO. </P> </LI> -<LI><A HREF="http://www.dre.vanderbilt.edu/~schmidt/CIAO.html">DAnCE</a> +<LI><A HREF="https://www.dre.vanderbilt.edu/~schmidt/CIAO.html">DAnCE</a> is an open-source implementation of the Deployment and Configuration standard (D&C) built on top of TAO. </P> </LI> @@ -54,7 +54,7 @@ Deployment and Configuration standard (D&C) built on top of TAO. </P> <P> After downloading a distribution we strongly advice to subscribe at least to one of the <A -HREF="http://www.dre.vanderbilt.edu/~schmidt/ACE-mail.html">announce +HREF="https://www.dre.vanderbilt.edu/~schmidt/ACE-mail.html">announce mailing lists</A> to stay informed about new releases and important updates.<P> @@ -66,7 +66,7 @@ from a number of companies. <P> <P> Doxygen documentation for releases of ACE/TAO/CIAO/DAnCE can be browsed <A -HREF="http://www.dre.vanderbilt.edu/Doxygen/">online</A>. +HREF="https://www.dre.vanderbilt.edu/Doxygen/">online</A>. <HR> <H3>Downloading Freely Available Versions of ACE, TAO, CIAO, and DAnCE</H3> @@ -92,81 +92,81 @@ Windows line feeds. For all other platforms download a .gz/.bz2 package. </P> <UL> -<LI> <B>Latest ACE+TAO Micro Release.</B> The latest micro release is ACE 6.5.8 and TAO 2.5.8 -(ACE+TAO x.5.8), please use the links below to download it.<P> +<LI> <B>Latest ACE+TAO Micro Release.</B> The latest micro release is ACE 6.5.9 and TAO 2.5.9 +(ACE+TAO x.5.9), please use the links below to download it.<P> <TABLE BORDER="4"> <TR><TH>Filename</TH><TH>Description</TH><TH>Full</TH><TH>Sources only</TH></TR> <TR><TD>ACE+TAO.tar.gz</TD> <TD>ACE+TAO (tar+gzip format)</TD> - <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE+TAO-6.5.8.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.8.tar.gz">FTP</A>] + <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_9/ACE+TAO-6.5.9.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.9.tar.gz">FTP</A>] </TD> - <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE+TAO-src-6.5.8.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.8.tar.gz">FTP</A>] + <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_9/ACE+TAO-src-6.5.9.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.9.tar.gz">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO.tar.bz2</TD> <TD>ACE+TAO (tar+bzip2 format)</TD> - <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE+TAO-6.5.8.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.8.tar.bz2">FTP</A>] + <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_9/ACE+TAO-6.5.9.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.9.tar.bz2">FTP</A>] </TD> - <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE+TAO-src-6.5.8.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.8.tar.bz2">FTP</A>] + <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_9/ACE+TAO-src-6.5.9.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.9.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO.zip</TD> <TD>ACE+TAO (zip format)</TD> - <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE+TAO-6.5.8.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.8.zip">FTP</A>] + <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_9/ACE+TAO-6.5.9.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.9.zip">FTP</A>] </TD> - <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE+TAO-src-6.5.8.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.8.zip">FTP</A>] + <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_9/ACE+TAO-src-6.5.9.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.9.zip">FTP</A>] </TD> </TR> <TR><TD>ACE-html.tar.gz</TD> <TD>Doxygen documentation for ACE+TAO (tar+gzip format)</TD> - <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE-html-6.5.8.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.8.tar.gz">FTP</A>] + <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_9/ACE-html-6.5.9.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.9.tar.gz">FTP</A>] </TD> </TR> <TR><TD>ACE-html.tar.bz2</TD> <TD>Doxygen documentation for ACE+TAO (tar+bzip2 format)</TD> - <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE-html-6.5.8.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.8.tar.bz2">FTP</A>] + <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_9/ACE-html-6.5.9.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.9.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>ACE-html.zip</TD> <TD>Doxygen documentation for ACE+TAO (zip format)</TD> - <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE-html-6.5.8.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.8.zip">FTP</A>] + <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_9/ACE-html-6.5.9.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.9.zip">FTP</A>] </TD> </TR> <TR><TD>ACE.tar.gz</TD> <TD>ACE only (tar+gzip format)</TD> - <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE-6.5.8.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.8.tar.gz">FTP</A>] + <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_9/ACE-6.5.9.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.9.tar.gz">FTP</A>] </TD> - <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE-src-6.5.8.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.8.tar.gz">FTP</A>] + <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_9/ACE-src-6.5.9.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.9.tar.gz">FTP</A>] </TD> </TR> <TR><TD>ACE.tar.bz2</TD> <TD>ACE only (tar+bzip2 format)</TD> - <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE-6.5.8.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.8.tar.bz2">FTP</A>] + <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_9/ACE-6.5.9.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.9.tar.bz2">FTP</A>] </TD> - <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE-src-6.5.8.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.8.tar.bz2">FTP</A>] + <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_9/ACE-src-6.5.9.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.9.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>ACE.zip</TD> <TD>ACE only (zip format)</TD> - <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE-6.5.8.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.8.zip">FTP</A>] + <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_9/ACE-6.5.9.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.9.zip">FTP</A>] </TD> - <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE-src-6.5.8.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.8.zip">FTP</A>] + <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_9/ACE-src-6.5.9.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.9.zip">FTP</A>] </TD> </TR> </TABLE> @@ -178,73 +178,73 @@ Windows line feeds. For all other platforms download a .gz/.bz2 package. <TR><TH>Filename</TH><TH>Description</TH><TH>Full</TH><TH>Sources only</TH></TR> <TR><TD>ACE+TAO-6.5.0.tar.gz</TD> <TD>ACE+TAO (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.0.tar.gz">HTTP</A>] + <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.0.tar.gz">HTTP</A>] [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.0.tar.gz">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.0.tar.gz">HTTP</A>] + <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.0.tar.gz">HTTP</A>] [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.0.tar.gz">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO-6.5.0.tar.bz2</TD> <TD>ACE+TAO (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.0.tar.bz2">HTTP</A>] + <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.0.tar.bz2">HTTP</A>] [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.0.tar.bz2">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.0.tar.bz2">HTTP</A>] + <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.0.tar.bz2">HTTP</A>] [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.0.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO-6.5.0.zip</TD> <TD>ACE+TAO (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.0.zip">HTTP</A>] + <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.0.zip">HTTP</A>] [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.0.zip">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.0.zip">HTTP</A>] + <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.0.zip">HTTP</A>] [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.0.zip">FTP</A>] </TD> </TR> <TR><TD>ACE-html-6.5.0.tar.gz</TD> <TD>Doxygen documentation for ACE+TAO (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.0.tar.gz">HTTP</A>] + <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.0.tar.gz">HTTP</A>] [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.0.tar.gz">FTP</A>] </TD> </TR> <TR><TD>ACE-html-6.5.0.tar.bz2</TD> <TD>Doxygen documentation for ACE+TAO (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.0.tar.bz2">HTTP</A>] + <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.0.tar.bz2">HTTP</A>] [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.0.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>ACE-html-6.5.0.zip</TD> <TD>Doxygen documentation for ACE+TAO (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.0.zip">HTTP</A>] + <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.0.zip">HTTP</A>] [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.0.zip">FTP</A>] </TD> </TR> <TR><TD>ACE-6.5.0.tar.gz</TD> <TD>ACE only (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.0.tar.gz">HTTP</A>] + <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.0.tar.gz">HTTP</A>] [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.0.tar.gz">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.0.tar.gz">HTTP</A>] + <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.0.tar.gz">HTTP</A>] [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.0.tar.gz">FTP</A>] </TD> </TR> <TR><TD>ACE-6.5.0.tar.bz2</TD> <TD>ACE only (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.0.tar.bz2">HTTP</A>] + <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.0.tar.bz2">HTTP</A>] [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.0.tar.bz2">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.0.tar.bz2">HTTP</A>] + <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.0.tar.bz2">HTTP</A>] [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.0.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>ACE-6.5.0.zip</TD> <TD>ACE only (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.0.zip">HTTP</A>] + <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.0.zip">HTTP</A>] [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.0.zip">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.0.zip">HTTP</A>] + <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.0.zip">HTTP</A>] [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.0.zip">FTP</A>] </TD> </TR> @@ -259,20 +259,20 @@ of the CIAO micro release is available for <TR><TH>Filename</TH><TH>Description</TH><TH>Sources only</TH></TR> <TR><TD>CIAO.tar.gz</TD> <TD>CIAO (tar+gzip format)</TD> - <TD>[<A HREF="https://github.com/DOCGroup/CIAO/releases/download/CIAO-1_3_8/CIAO-1_3_8-src.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/CIAO-1_3_8-src.tar.gz">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/CIAO/releases/download/CIAO-1_3_9/CIAO-1_3_9-src.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/CIAO-1_3_9-src.tar.gz">FTP</A>] </TD> </TR> <TR><TD>CIAO.tar.bz2</TD> <TD>CIAO (tar+bzip2 format)</TD> - <TD>[<A HREF="https://github.com/DOCGroup/CIAO/releases/download/CIAO-1_3_8/CIAO-1_3_8-src.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/CIAO-1_3_8-src.tar.bz2">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/CIAO/releases/download/CIAO-1_3_9/CIAO-1_3_9-src.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/CIAO-1_3_9-src.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>CIAO.zip</TD> <TD>CIAO (zip format)</TD> - <TD>[<A HREF="https://github.com/DOCGroup/CIAO/releases/download/CIAO-1_3_8/CIAO-1_3_8-src.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/CIAO-1_3_8-src.zip">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/CIAO/releases/download/CIAO-1_3_9/CIAO-1_3_9-src.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/CIAO-1_3_9-src.zip">FTP</A>] </TD> </TR> </TABLE> @@ -286,20 +286,20 @@ of the DAnCE micro release is available for <TR><TH>Filename</TH><TH>Description</TH><TH>Sources only</TH></TR> <TR><TD>DAnCE.tar.gz</TD> <TD>DAnCE (tar+gzip format)</TD> - <TD>[<A HREF="https://github.com/DOCGroup/DAnCE/releases/download/DAnCE-1_3_8/DAnCE-1_3_8-src.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/DAnCE-1_3_8-src.tar.gz">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/DAnCE/releases/download/DAnCE-1_3_9/DAnCE-1_3_9-src.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/DAnCE-1_3_9-src.tar.gz">FTP</A>] </TD> </TR> <TR><TD>DAnCE.tar.bz2</TD> <TD>DAnCE (tar+bzip2 format)</TD> - <TD>[<A HREF="https://github.com/DOCGroup/DAnCE/releases/download/DAnCE-1_3_8/DAnCE-1_3_8-src.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/DAnCE-1_3_8-src.tar.bz2">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/DAnCE/releases/download/DAnCE-1_3_9/DAnCE-1_3_9-src.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/DAnCE-1_3_9-src.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>DAnCE.zip</TD> <TD>DAnCE (zip format)</TD> - <TD>[<A HREF="https://github.com/DOCGroup/DAnCE/releases/download/DAnCE-1_3_8/DAnCE-1_3_8-src.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/DAnCE-1_3_8-src.zip">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/DAnCE/releases/download/DAnCE-1_3_9/DAnCE-1_3_9-src.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/DAnCE-1_3_9-src.zip">FTP</A>] </TD> </TR> </TABLE> @@ -308,7 +308,7 @@ of the DAnCE micro release is available for <P> Older versions of ACE+TAO are also available via HTTP at <A - HREF="http://download.dre.vanderbilt.edu/previous_versions">this location</A> + HREF="https://download.dre.vanderbilt.edu/previous_versions">this location</A> . This location has a few of the previous major and minor releases. This location will house all major, minor, and micro releases distributed after ACE+TAO-5.2+1.2. diff --git a/ACE/docs/bczar/bczar.html b/ACE/docs/bczar/bczar.html index 7fdd7be04f2..1bee3c80a04 100644 --- a/ACE/docs/bczar/bczar.html +++ b/ACE/docs/bczar/bczar.html @@ -278,7 +278,7 @@ rm -rf doxygen<br> mkdir doxygen<br> cd doxygen<br> - git clone https://github.com/DOCGroup/ACE_TAO.git --depth 1 --branch ACE+TAO-6_5_8 ACE_TAO<br> + git clone https://github.com/DOCGroup/ACE_TAO.git --depth 1 --branch ACE+TAO-6_5_9 ACE_TAO<br> cd ACE_TAO<br> export ACE_ROOT=$PWD/ACE<br> export TAO_ROOT=$PWD/TAO<br> diff --git a/ACE/etc/index.html b/ACE/etc/index.html index 95774fc3bf7..975b46eb610 100644 --- a/ACE/etc/index.html +++ b/ACE/etc/index.html @@ -30,6 +30,7 @@ <hr> We do have the documentation for previous releases <ul> + <LI><P><A HREF="6.5.9/html">6.5.9</A></P></LI> <LI><P><A HREF="6.5.8/html">6.5.8</A></P></LI> <LI><P><A HREF="6.5.7/html">6.5.7</A></P></LI> <LI><P><A HREF="6.5.6/html">6.5.6</A></P></LI> diff --git a/ACE/examples/APG/Config/ARGV_Example.cpp b/ACE/examples/APG/Config/ARGV_Example.cpp index c28134e84db..e5b70b5f5f5 100644 --- a/ACE/examples/APG/Config/ARGV_Example.cpp +++ b/ACE/examples/APG/Config/ARGV_Example.cpp @@ -27,18 +27,18 @@ int ACE_TMAIN (int, ACE_TCHAR *[]) int option; ACE_TCHAR config_file[MAXPATHLEN]; ACE_TCHAR hostname[MAXHOSTNAMELEN]; - ACE_OS_String::strcpy (config_file, ACE_TEXT ("HAStatus.conf")); - ACE_OS_String::strcpy (hostname, ACE_TEXT ("not set")); + ACE_OS::strcpy (config_file, ACE_TEXT ("HAStatus.conf")); + ACE_OS::strcpy (hostname, ACE_TEXT ("not set")); while ((option = cmd_opts ()) != EOF) switch (option) { case 'f': - ACE_OS_String::strncpy (config_file, + ACE_OS::strncpy (config_file, cmd_opts.opt_arg (), MAXPATHLEN); break; case 'h': - ACE_OS_String::strncpy (hostname, + ACE_OS::strncpy (hostname, cmd_opts.opt_arg (), MAXHOSTNAMELEN); break; diff --git a/ACE/examples/APG/Config/Get_Opt.cpp b/ACE/examples/APG/Config/Get_Opt.cpp index b6a08ec186a..26dc5dd6fb5 100644 --- a/ACE/examples/APG/Config/Get_Opt.cpp +++ b/ACE/examples/APG/Config/Get_Opt.cpp @@ -23,11 +23,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) int option; ACE_TCHAR config_file[MAXPATHLEN]; - ACE_OS_String::strcpy (config_file, ACE_TEXT ("HAStatus.conf")); + ACE_OS::strcpy (config_file, ACE_TEXT ("HAStatus.conf")); while ((option = cmd_opts ()) != EOF) switch (option) { case 'f': - ACE_OS_String::strncpy (config_file, + ACE_OS::strncpy (config_file, cmd_opts.opt_arg (), MAXPATHLEN); break; diff --git a/ACE/examples/APG/Config/Get_Opt_Long.cpp b/ACE/examples/APG/Config/Get_Opt_Long.cpp index c6506153634..4f869149714 100644 --- a/ACE/examples/APG/Config/Get_Opt_Long.cpp +++ b/ACE/examples/APG/Config/Get_Opt_Long.cpp @@ -20,11 +20,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) int option; ACE_TCHAR config_file[MAXPATHLEN]; - ACE_OS_String::strcpy (config_file, ACE_TEXT ("HAStatus.conf")); + ACE_OS::strcpy (config_file, ACE_TEXT ("HAStatus.conf")); while ((option = cmd_opts ()) != EOF) switch (option) { case 'f': - ACE_OS_String::strncpy (config_file, + ACE_OS::strncpy (config_file, cmd_opts.opt_arg (), MAXPATHLEN); break; diff --git a/ACE/examples/IPC_SAP/SSL_SAP/README b/ACE/examples/IPC_SAP/SSL_SAP/README index 6e7f0b51e27..f47c084da13 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/README +++ b/ACE/examples/IPC_SAP/SSL_SAP/README @@ -1,5 +1,3 @@ - - This directory contains groups of client and server test programs that exercise the various C++ wrappers for SSL sockets. In general, the test programs do more or less the same thing -- the client establishes diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h index 66e030b51bc..db1ad45bf4c 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h @@ -73,7 +73,7 @@ private: // Sleep_Time value. enum {QUIT_STRING_SIZE = 128}; - char quit_string_[QUIT_STRING_SIZE]; + char quit_string_[QUIT_STRING_SIZE + 1]; // String that shuts down the client/server. size_t message_len_; diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.h b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.h index 073ca0f9cac..e445e35c147 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.h +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.h @@ -10,80 +10,79 @@ #include "ace/SSL/SSL_SOCK_Stream.h" +/// Define the options for this test. class Options - // = TITLE - // Define the options for this test. { public: - Options (void); // Constructor. + Options (void); - ~Options (void); // Destructor. + ~Options (void); - int parse_args (int argc, ACE_TCHAR *argv[]); // Parse the command-line arguments. + int parse_args (int argc, ACE_TCHAR *argv[]); - const ACE_Time_Value &sleep_time (void) const; // Return the amount of time to sleep in order to implement the // proper transmission rates. + const ACE_Time_Value &sleep_time (void) const; - u_short port (void) const; // Port of the server. + u_short port (void) const; - const ACE_TCHAR *host (void) const; // Host of the server. + const ACE_TCHAR *host (void) const; - size_t threads (void) const; // Number of threads. + size_t threads (void) const; - const char *quit_string (void) const; // String that shuts down the client/server. + const char *quit_string (void) const; - ssize_t read (void *buf, size_t len, size_t &iterations); // Read from the appropriate location. + ssize_t read (void *buf, size_t len, size_t &iterations); - size_t message_len (void) const; // Returns the length of the message to send. + size_t message_len (void) const; - const void *message_buf (void) const; // Returns a pointer to the message. + const void *message_buf (void) const; - ACE_THR_FUNC thr_func (void); // Returns a pointer to the entry point into the thread that runs // the client test function. + ACE_THR_FUNC thr_func (void); private: - int init (void); // Initialize the message we're sending to the user and set up the // barrier. + int init (void); - char *shared_client_test (u_short port, - ACE_SSL_SOCK_Stream &cli_stream); // Performs the shared behavior of the oneway and twoway client // tests. + char *shared_client_test (u_short port, + ACE_SSL_SOCK_Stream &cli_stream); - static void *twoway_client_test (void *); // Performs the twoway test. + static void *twoway_client_test (void *); - static void *oneway_client_test (void *); // Performs the oneway test. + static void *oneway_client_test (void *); - const ACE_TCHAR *host_; // Host of the server. + const ACE_TCHAR *host_; - u_short port_; // Port of the server. + u_short port_; - ACE_Time_Value sleep_time_; // Sleep_Time value. + ACE_Time_Value sleep_time_; - size_t threads_; // Number of threads. + size_t threads_; - enum {QUIT_STRING_SIZE = 128}; - char quit_string_[QUIT_STRING_SIZE]; // String that shuts down the client/server. + enum {QUIT_STRING_SIZE = 128}; + char quit_string_[QUIT_STRING_SIZE + 1]; size_t message_len_; // Size of the message we send to the server. diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp index 07f599db404..b6cae2fe044 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp @@ -5,13 +5,10 @@ #include "ace/Handle_Set.h" #include "ace/Profile_Timer.h" #include "ace/OS_NS_sys_select.h" - #include "ace/SSL/SSL_SOCK_Acceptor.h" - - // Are we running verbosely? -static int verbose = 1; +static bool verbose = true; // Function entry point into the twoway server task. diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server.cpp index 2b23d67d8bc..012ac569d99 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server.cpp +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server.cpp @@ -10,10 +10,8 @@ #include "ace/SSL/SSL_SOCK_Acceptor.h" - - // Are we running verbosely? -static int verbose = 0; +static bool verbose = false; static void run_server (ACE_THR_FUNC server, @@ -34,7 +32,6 @@ run_server (ACE_THR_FUNC server, } // Function entry point into the twoway server task. - static ACE_THR_FUNC_RETURN twoway_server (void *arg) { diff --git a/ACE/examples/Reactor/WFMO_Reactor/APC.cpp b/ACE/examples/Reactor/WFMO_Reactor/APC.cpp index 8fb78608531..bb2000fa963 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/APC.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/APC.cpp @@ -13,7 +13,7 @@ #include "ace/OS_main.h" -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && _WIN32_WINNT >= 0x400 #include "ace/Reactor.h" #include "ace/Auto_Event.h" diff --git a/ACE/include/makeinclude/platform_android.GNU b/ACE/include/makeinclude/platform_android.GNU index 94b52b16748..fd3525162b2 100644 --- a/ACE/include/makeinclude/platform_android.GNU +++ b/ACE/include/makeinclude/platform_android.GNU @@ -177,3 +177,13 @@ endif # Link To Android Logging Library for Log_Msg_Android_Logcat LIBS += -llog + +# link step to avoid 'command line too long' error on Windows +ifeq ($(OS), Windows_NT) + SHOBJS_FILE = $(VSHDIR)$(MAKEFILE)_object_list.tmp + CLEANUP_OBJS += $(SHOBJS_FILE) + define SHLIBBUILD + $(file >$(SHOBJS_FILE), $^) + $(SHR_FILTER) $(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ @$(SHOBJS_FILE) $(LDFLAGS) $(ACE_SHLIBS) $(LIBS) + endef +endif diff --git a/ACE/include/makeinclude/platform_clang_common.GNU b/ACE/include/makeinclude/platform_clang_common.GNU index 00ca5467051..96cb57ddc2a 100644 --- a/ACE/include/makeinclude/platform_clang_common.GNU +++ b/ACE/include/makeinclude/platform_clang_common.GNU @@ -75,7 +75,7 @@ ifneq ($(DLD),) LD_FOR_VERSION_TEST = $(DLD) endif # DLD = CXX_FOR_VERSION_TEST # The -E option is GNU ld specific - GNU_LD := $(if $(findstring GNU ld,$(shell $(LD_FOR_VERSION_TEST) -v)), 1, 0) + GNU_LD := $(if $(findstring GNU ld,$(shell $(LD_FOR_VERSION_TEST) -v 2>&1)), 1, 0) endif # DLD ifeq ($(GNU_LD),1) diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec index ee5965ed229..c745532a186 100644 --- a/ACE/rpmbuild/ace-tao.spec +++ b/ACE/rpmbuild/ace-tao.spec @@ -1,6 +1,6 @@ # Set the version number here. -%define ACEVER 6.5.8 -%define TAOVER 2.5.8 +%define ACEVER 6.5.9 +%define TAOVER 2.5.9 # Conditional build # Default values are @@ -84,7 +84,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define _extension .gz %if 0%{?fedora} || 0%{?rhel} -BuildRequires: redhat-rpm-config elfutils sendmail +BuildRequires: redhat-rpm-config elfutils %endif %if !0%{?suse_version} @@ -829,6 +829,8 @@ export TAO_ROOT=$ACE_ROOT/TAO g++ --version g++ -dumpversion +%define inline %{nil} + %if %skip_make cd .. && rm -rf ACE_wrappers && ln -s ACE_wrappers-BUILT ACE_wrappers @@ -1218,6 +1220,7 @@ install ${ACE_ROOT}/bin/ace_gperf %{buildroot}%{_bindir} install ${ACE_ROOT}/bin/tao_idl %{buildroot}%{_bindir} install ${ACE_ROOT}/bin/tao_imr %{buildroot}%{_bindir} install ${ACE_ROOT}/bin/tao_ifr %{buildroot}%{_bindir} +install ${ACE_ROOT}/TAO/orbsvcs/IFR_Service/tao_ifr_service %{buildroot}%{_bindir} install ${ACE_ROOT}/bin/tao_catior %{buildroot}%{_bindir}/tao_catior install ${ACE_ROOT}/bin/tao_nsadd %{buildroot}%{_bindir}/tao_nsadd install ${ACE_ROOT}/bin/tao_nsdel %{buildroot}%{_bindir}/tao_nsdel @@ -2275,6 +2278,7 @@ fi %{_bindir}/tao_imr %{_bindir}/tao_ifr +%{_bindir}/tao_ifr_service %{_datadir}/tao/MPC %{_bindir}/tao_idl %attr(0644,root,root) %doc %{_mandir}/man1/tao_idl.1%{_extension} diff --git a/ACE/tests/ARGV_Test.cpp b/ACE/tests/ARGV_Test.cpp index 74f7d7485e2..59d72dab714 100644 --- a/ACE/tests/ARGV_Test.cpp +++ b/ACE/tests/ARGV_Test.cpp @@ -67,14 +67,14 @@ static int test_argv_type_converter (void) { char *argv[20]; - argv[0] = ACE_OS_String::strdup ("one"); - argv[1] = ACE_OS_String::strdup ("two"); - argv[2] = ACE_OS_String::strdup ("three"); - argv[3] = ACE_OS_String::strdup ("four"); + argv[0] = ACE_OS::strdup ("one"); + argv[1] = ACE_OS::strdup ("two"); + argv[2] = ACE_OS::strdup ("three"); + argv[3] = ACE_OS::strdup ("four"); argv[4] = 0; char *save_argv[20]; - ACE_OS_String::memcpy (save_argv, argv, sizeof (argv)); + ACE_OS::memcpy (save_argv, argv, sizeof (argv)); int argc = 4; @@ -102,7 +102,7 @@ test_argv_type_converter (void) } for (size_t i = 0; save_argv[i]; ++i) - ACE_OS_Memory::free (save_argv[i]); + ACE_OS::free (save_argv[i]); return 0; } @@ -111,14 +111,14 @@ static int test_argv_type_converter2 (void) { ACE_TCHAR *argv[20]; - argv[0] = ACE_OS_String::strdup (ACE_TEXT ("one")); - argv[1] = ACE_OS_String::strdup (ACE_TEXT ("two")); - argv[2] = ACE_OS_String::strdup (ACE_TEXT ("three")); - argv[3] = ACE_OS_String::strdup (ACE_TEXT ("four")); + argv[0] = ACE_OS::strdup (ACE_TEXT ("one")); + argv[1] = ACE_OS::strdup (ACE_TEXT ("two")); + argv[2] = ACE_OS::strdup (ACE_TEXT ("three")); + argv[3] = ACE_OS::strdup (ACE_TEXT ("four")); argv[4] = 0; ACE_TCHAR *save_argv[20]; - ACE_OS_String::memcpy (save_argv, argv, sizeof (argv)); + ACE_OS::memcpy (save_argv, argv, sizeof (argv)); int argc = 4; @@ -139,7 +139,7 @@ test_argv_type_converter2 (void) } for (size_t i = 0; save_argv[i]; ++i) - ACE_OS_Memory::free (save_argv[i]); + ACE_OS::free (save_argv[i]); return 0; } diff --git a/ACE/tests/Compiler_Features_13_Test.cpp b/ACE/tests/Compiler_Features_13_Test.cpp index 61dd46be09a..15308dc8af3 100644 --- a/ACE/tests/Compiler_Features_13_Test.cpp +++ b/ACE/tests/Compiler_Features_13_Test.cpp @@ -1,6 +1,4 @@ /** - * @file - * * This program checks if the compiler / platform supports the * standard cast operators template parameters. The motivation for * this test was a discussion on the development mailing list, and the @@ -12,6 +10,7 @@ #include "test_config.h" #include <stdexcept> +#include <typeinfo> namespace { @@ -42,7 +41,6 @@ namespace }; } - int run_main (int, ACE_TCHAR *[]) { @@ -103,7 +101,7 @@ run_main (int, ACE_TCHAR *[]) ACE_TEXT("dynamic_cast should return null\n"))); } - // Make sure dynamic cast raises an exception + // Make sure dynamic cast raises a bad_cast exception Base & b3 = a; try { @@ -111,16 +109,16 @@ run_main (int, ACE_TCHAR *[]) status = 1; ACE_ERROR((LM_ERROR, - ACE_TEXT("dynamic_cast should have raised exception\n"))); + ACE_TEXT("dynamic_cast should have raised std::bad_cast\n"))); } - catch(std::exception const &) + catch(std::bad_cast const &) { } catch(...) { status = 1; ACE_ERROR((LM_ERROR, - ACE_TEXT("dynamic_cast should have raised std::exception\n"))); + ACE_TEXT("dynamic_cast should have raised std::bad_cast\n"))); } { @@ -140,4 +138,3 @@ run_main (int, ACE_TCHAR *[]) ACE_END_TEST; return status; } - diff --git a/ACE/tests/Compiler_Features_32_Test.cpp b/ACE/tests/Compiler_Features_32_Test.cpp index f51b9e16803..29590337a2f 100644 --- a/ACE/tests/Compiler_Features_32_Test.cpp +++ b/ACE/tests/Compiler_Features_32_Test.cpp @@ -46,7 +46,7 @@ void A::clear () { #if defined __clang__ && \ (defined __apple_build_version__ && __apple_build_version__ <= 11000033 \ - || __clang_major__ <= 9) + || __clang_major__ <= 10) #define CLANG_WORKAROUND #endif diff --git a/ACE/tests/INET_Addr_Test_IPV6.cpp b/ACE/tests/INET_Addr_Test_IPV6.cpp index c687832b66b..097e03c9d26 100644 --- a/ACE/tests/INET_Addr_Test_IPV6.cpp +++ b/ACE/tests/INET_Addr_Test_IPV6.cpp @@ -20,6 +20,7 @@ #if defined (ACE_HAS_IPV6) #define LINK_LOCAL_ADDR ACE_TEXT ("fe80::") +#define SITE_LOCAL_ADDR ACE_TEXT ("fec0::") #define THE_INTERFACE ("eth0") // Make sure that ACE_Addr::addr_type_ is the same @@ -185,6 +186,13 @@ int run_main (int, ACE_TCHAR *[]) #if defined (ACE_LINUX) // test a link local address to make sure the set_interface method works ACE_INET_Addr link_local_addr (80, LINK_LOCAL_ADDR); + if (!link_local_addr.is_linklocal()) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("IPv6 is_linklocal failed\n"))); + status = 1; + } + if (0 != ACE_OS::strcmp (ACE_TEXT_CHAR_TO_TCHAR(link_local_addr.get_host_addr ()), LINK_LOCAL_ADDR)) { @@ -202,6 +210,16 @@ int run_main (int, ACE_TCHAR *[]) ACE_TEXT ("IPv6 set_interface failed\n"))); status = 1; } + + // test a site local address + ACE_INET_Addr site_local_addr (80, SITE_LOCAL_ADDR); + if (!site_local_addr.is_sitelocal()) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("IPv6 is_sitelocal failed\n"))); + status = 1; + } + #endif /* ACE_LINUX */ } diff --git a/ACE/tests/Message_Queue_Test.cpp b/ACE/tests/Message_Queue_Test.cpp index d20802ebd51..391d73f284a 100644 --- a/ACE/tests/Message_Queue_Test.cpp +++ b/ACE/tests/Message_Queue_Test.cpp @@ -838,8 +838,8 @@ prio_test (void) mb1p->rd_ptr (), mb2p->rd_ptr ())); - if (ACE_OS_String::strcmp (mb1p->rd_ptr (), S1) == 0 - && ACE_OS_String::strcmp (mb2p->rd_ptr (), S2) == 0) + if (ACE_OS::strcmp (mb1p->rd_ptr (), S1) == 0 + && ACE_OS::strcmp (mb2p->rd_ptr (), S2) == 0) status = 0; else status = 1; diff --git a/ACE/tests/Network_Adapters_Test.cpp b/ACE/tests/Network_Adapters_Test.cpp index 0e43095c5bb..395b49cf117 100644 --- a/ACE/tests/Network_Adapters_Test.cpp +++ b/ACE/tests/Network_Adapters_Test.cpp @@ -844,7 +844,7 @@ extern "C" #endif /* #if defined (ACE_HAS_SIG_C_FUNC) */ #if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) -BOOL CtrlHandler(DWORD fdwCtrlType) +static BOOL WINAPI CtrlHandler(DWORD fdwCtrlType) { switch (fdwCtrlType) { @@ -1021,7 +1021,7 @@ run_main (int argc, ACE_TCHAR *argv[]) #if defined (ACE_WIN32) #if !defined (ACE_HAS_WINCE) - SetConsoleCtrlHandler((PHANDLER_ROUTINE) CtrlHandler, TRUE); + SetConsoleCtrlHandler(&CtrlHandler, TRUE); #endif #else /* #if defined (ACE_WIN32) */ // Set a handler for SIGSEGV signal to call for abort. diff --git a/ACE/tests/Process_Env_Test.cpp b/ACE/tests/Process_Env_Test.cpp index e6f8bdc5099..8334dbd15a3 100644 --- a/ACE/tests/Process_Env_Test.cpp +++ b/ACE/tests/Process_Env_Test.cpp @@ -35,14 +35,12 @@ void create_large_env (setenvfn_t setenv, void *ctx) } } - void apo_setenv (const ACE_TCHAR *name, const ACE_TCHAR *value, void *ctx) { ACE_Process_Options *apo = static_cast<ACE_Process_Options *> (ctx); apo->setenv (name, value); } - void thisproc_setenv (const ACE_TCHAR *name, const ACE_TCHAR *value, void *) { ACE_TString putstr (name); @@ -50,7 +48,6 @@ void thisproc_setenv (const ACE_TCHAR *name, const ACE_TCHAR *value, void *) putstr += value; ACE_OS::putenv (putstr.c_str ()); } - #endif int @@ -71,10 +68,23 @@ run_main (int, ACE_TCHAR*[]) ACE_Process process; if (process.spawn (options) != -1) { - ACE_ERROR ((LM_ERROR, - "ERROR: This should have failed due to the large " - "environment buffer\n")); - test_status = 1; + /* + * In Windows versions < Vista the ENTIRE environment block could be a + * maximum of 32,767 bytes long + * + * In Windows versions > Vista it's 32,767 bytes per environment variable + */ +#if (_WIN32_WINNT < 0x0600) + ACE_ERROR ((LM_ERROR, + "ERROR: This should have failed due to the large " + "environment buffer\n")); + + test_status = 1; +#else + ACE_DEBUG ((LM_DEBUG, + "Using large environment buffer works as expected " + "on Windows vista or newer\n")); +#endif /* _WIN32_WINNT < 0x0600 */ } options.enable_unicode_environment (); diff --git a/ACE/tests/SSL/Bug_2912_Regression_Test.cpp b/ACE/tests/SSL/Bug_2912_Regression_Test.cpp index c713456137a..653b9ade93d 100644 --- a/ACE/tests/SSL/Bug_2912_Regression_Test.cpp +++ b/ACE/tests/SSL/Bug_2912_Regression_Test.cpp @@ -114,7 +114,6 @@ Client_Proactor_Task::svc (void) return 0; } - /** * Server's proactor */ diff --git a/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp b/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp index 8008e7351ab..548c18f1e89 100644 --- a/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp +++ b/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp @@ -32,7 +32,6 @@ */ //============================================================================= - #include "../test_config.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_unistd.h" @@ -43,8 +42,6 @@ #include "ace/SSL/SSL_SOCK_Connector.h" #include "ace/SSL/SSL_SOCK_Acceptor.h" - - #if defined (ACE_HAS_THREADS) #include "Thread_Pool_Reactor_SSL_Test.h" @@ -104,7 +101,7 @@ parse_arg (int argc, ACE_TCHAR *argv[]) break; default: ACE_ERROR ((LM_ERROR, - "Usage: Thread_Pool_Reactor_Test [-r <hostname:port#>]" + "Usage: Thread_Pool_Reactor_SSL_Test [-r <hostname:port#>]" "\t[-s <server thr#>] [-c <client thr#>] [-d <delay>]" "\t[-i <client conn attempt#>]" "[-n <client request# per conn>]\n")); diff --git a/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h b/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h index 64f251f2f62..6d96043f40f 100644 --- a/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h +++ b/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h @@ -11,7 +11,6 @@ */ //============================================================================= - #ifndef ACE_TESTS_THREAD_POOL_REACTOR_TEST_SSL_H #define ACE_TESTS_THREAD_POOL_REACTOR_TEST_SSL_H @@ -23,11 +22,10 @@ #include "ace/Svc_Handler.h" +/// This class is the Svc_Handler used by <Acceptor>. class Request_Handler : public ACE_Svc_Handler<ACE_SSL_SOCK_Stream, ACE_MT_SYNCH> { - // = TITLE - // This class is the Svc_Handler used by <Acceptor>. public: /// The default constructor makes sure the right reactor is used. Request_Handler (ACE_Thread_Manager *tm = 0); @@ -37,7 +35,7 @@ protected: virtual int handle_close (ACE_HANDLE fd, ACE_Reactor_Mask = 0); private: - size_t nr_msgs_rcvd_; + size_t nr_msgs_rcvd_; }; #endif /* ACE_TESTS_THREAD_POOL_REACTOR_TEST_SSL_H */ diff --git a/ACE/tests/tests.mpc b/ACE/tests/tests.mpc index 1b4b2324ea6..f604aa67a8b 100644 --- a/ACE/tests/tests.mpc +++ b/ACE/tests/tests.mpc @@ -614,15 +614,6 @@ project(Compiler_Features_07_Test) : acetest { } } -// This compiler feature is not supported on all compilers -project(Compiler_Features_08_Test) : acetest { - requires += dummy_label - exename = Compiler_Features_08_Test - Source_Files { - Compiler_Features_08_Test.cpp - } -} - project(Compiler_Features_09_Test) : acetest { exename = Compiler_Features_09_Test Source_Files { diff --git a/TAO/ChangeLogs/TAO-2_5_9 b/TAO/ChangeLogs/TAO-2_5_9 new file mode 100644 index 00000000000..496daaa2dc2 --- /dev/null +++ b/TAO/ChangeLogs/TAO-2_5_9 @@ -0,0 +1,260 @@ +commit cce840e88439eb21e24df18a2668856bbccc1e21 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Apr 29 16:33:29 2020 +0200 + + Removed left over ACE_CDR_LONGLONG_INITIALIZER, related to #1090 + + * TAO/TAO_IDL/fe/idl.ll: + * TAO/TAO_IDL/fe/idl.yy.cpp: + +commit 7dfaded78138a3ad8a3f3bdf5bef3c611ffeca23 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Apr 28 19:10:42 2020 +0200 + + Layout and doxygen changes + + * TAO/tao/Special_Basic_Argument_T.h: + * TAO/tao/Storable_Base.h: + * TAO/tao/Storable_Factory.h: + * TAO/tao/Storable_File_Guard.h: + * TAO/tao/Storable_FlatFileStream.h: + * TAO/tao/String_Manager_T.h: + +commit d9e956d4b7270bc34e9ad1e74ab4126fc970bfa1 +Author: Son Dinh <dinhs@objectcomputing.com> +Date: Tue Apr 28 14:33:46 2020 -0500 + + Cleanup + +commit d0f75bede9608ba56a332f80b5a0d5a90e3e3ad5 +Author: Son Dinh <dinhs@objectcomputing.com> +Date: Tue Apr 28 14:17:48 2020 -0500 + + Remove additional overloaded operators and change caller code instead + +commit 6542591505d81e79e2d3abd9bd4f497f1adafb9a +Merge: 6bab61a7d0a 57e38a7b4a4 +Author: Son Dinh <dinhs@objectcomputing.com> +Date: Tue Apr 28 09:39:00 2020 -0500 + + Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO into basic_types_macos + +commit ad17ff63affd12aa82869308875e2630972132c9 +Merge: 2e234782449 57bc0064bdf +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Apr 28 15:51:51 2020 +0200 + + Merge pull request #1093 from jwillemsen/jwi-ace-cpp20 + + When __cplusplus is equal or bigger as 202002L we define ACE_HAS_CPP20 + +commit 2e234782449d31eff4a88aaaf90ff7085558d99a +Merge: aedcae37cbf f38497c7057 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Apr 28 15:51:24 2020 +0200 + + Merge pull request #1090 from jwillemsen/jwi-cdrbaselonglong-cleanup + + Map ACE_CDR LongLong to ACE_INT64, all platforms for which we needed … + +commit 2031410e265b9711c180bd9221d1188aaec945b6 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Apr 28 09:45:50 2020 +0200 + + Fixed docu typos + + * TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.h: + +commit 6bab61a7d0a8a953285d3dc2862c68a3f89976e5 +Author: Son Dinh <dinhs@objectcomputing.com> +Date: Sun Apr 26 15:04:21 2020 -0500 + + Update printing format + +commit c4f4af8bff18366ed85cdb080ea801e2999d9f7c +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Apr 25 10:52:11 2020 +0200 + + Cleanup some last leftovers from old and deprecated tandem support + + * ACE/ace/ACE_export.h: + * ACE/ace/Basic_Types.h: + * ACE/ace/config-macros.h: + * ACE/ace/os_include/sys/os_types.h: + * TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp: + +commit 17a3a7e2eaf969480c4c26d30b74c95ce90d842e +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Apr 25 10:50:22 2020 +0200 + + Map ACE_CDR LongLong to ACE_INT64, all platforms for which we needed an emulation have been deprecated in the past. + + * ACE/ace/CDR_Base.cpp: + * ACE/ace/CDR_Base.h: + * ACE/ace/CDR_Size.h: + * ACE/ace/README: + * ACE/ace/config-kfreebsd.h: + * ACE/ace/config-qnx.h: + * TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp: + * TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp: + * TAO/TAO_IDL/be/be_visitor_attr_init.cpp: + * TAO/TAO_IDL/be/be_visitor_null_return_value.cpp: + * TAO/TAO_IDL/fe/idl.yy.cpp: + * TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp: + * TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp: + * TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp: + +commit 64dd9fd7ab12f72daaf3bfc60af618718c800fdc +Author: Son Dinh <dinhs@objectcomputing.com> +Date: Fri Apr 24 10:02:12 2020 -0500 + + Fix printing format + +commit 9609100ac7f226ea056b60abcbc262015275eb5b +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Apr 23 13:16:40 2020 +0200 + + Layout changes + + * ACE/ace/Malloc_Base.h: + * ACE/ace/SString.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.cpp: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.h: + +commit 4769f4a6dfd4110aab6cea30a978a5ed2e3f1da5 +Author: Son Dinh <dinhs@objectcomputing.com> +Date: Wed Apr 22 16:29:22 2020 -0500 + + Use size_t instead of unsigned long + +commit aaf3877d5e0a2e3ad32579b7486c42c6c8506df0 +Author: Son Dinh <dinhs@objectcomputing.com> +Date: Wed Apr 22 16:02:49 2020 -0500 + + Add other C++11 types + +commit 551fedf2a88deb604a3ec1184c6f40c98782cdd6 +Author: Son Dinh <dinhs@objectcomputing.com> +Date: Tue Apr 21 14:15:23 2020 -0500 + + move headers out of namespace + +commit 28eb828a89f225b5aced9ec600d357107b6df16a +Author: Son Dinh <dinhs@objectcomputing.com> +Date: Mon Apr 20 22:56:17 2020 -0500 + + Add overloaded operators definitions + +commit 9c1c550ec6757373a5bcc160694f21ab5fcffdd6 +Author: Son Dinh <dinhs@objectcomputing.com> +Date: Mon Apr 20 18:36:15 2020 -0500 + + Add a forward declaration of read_integer + +commit ba25cff827d7325287547956308022aa0c1d225f +Author: Son Dinh <dinhs@objectcomputing.com> +Date: Mon Apr 20 16:39:08 2020 -0500 + + Removed trailing whitespaces + +commit 166bccb7f2a9e09f8e7bca36338daa894c6394fa +Author: Son Dinh <dinhs@objectcomputing.com> +Date: Mon Apr 20 16:34:26 2020 -0500 + + Avoid redefining overloaded operators for unsigned long + +commit ede89c300ab0009ecb57c6ddf88a2176a97782cb +Author: Son Dinh <dinhs@objectcomputing.com> +Date: Sun Apr 19 23:00:55 2020 -0500 + + Conditionally add overloaded operators + +commit ac3abf49acfe2fad2da6dfc11e4a13a268c3ff32 +Author: Son Dinh <dinhs@objectcomputing.com> +Date: Sun Apr 19 21:54:22 2020 -0500 + + Add hash functors conditionally and related overloaded operators + +commit a1b647e4348ddff1242655c05f9b7d214bc11643 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Apr 14 08:22:09 2020 +0200 + + Make use of https download.dre + + * ACE/Kokyu/docs/Kokyu.html: + * ACE/README: + * ACE/ace/DLL_Manager.h: + * ACE/ace/FIFO_Send.h: + * ACE/ace/Managed_Object.h: + * ACE/ace/config-win32-common.h: + * ACE/debian/README.source: + * ACE/docs/Download.html: + * TAO/TAO-INSTALL.html: + * TAO/docs/Security/Download.html: + * TAO/docs/tutorials/Quoter/index.html: + +commit 7bb0ad4a56ff69945c7c106f0bda43dde8e75670 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Apr 8 09:07:22 2020 +0200 + + Minor layout/const/doxygen changes + + * TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h: + * TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp: + * TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h: + * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h: + * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h: + * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h: + * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h: + * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h: + * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h: + * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp: + * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h: + * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h: + * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h: + * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h: + * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h: + * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h: + * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h: + * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h: + * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h: + * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h: + * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h: + * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h: + * TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h: + * TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h: + * TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h: + * TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h: + * TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h: + * TAO/orbsvcs/orbsvcs/Trader/Interpreter.h: + * TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h: + +commit 08e08d58760277f539806bb2f7624359562d5915 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Mar 13 11:53:27 2020 +0100 + + Generate get_type_name as part of the DDS traits, could be used for logging purposes + + * TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp: + +commit bc79ed1fc15c999c1c39a8de684311b81ec1f359 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Mar 12 17:17:55 2020 +0100 + + Fixed some typos in comments and removed some empty lines + + * TAO/tao/ORB.cpp: + * TAO/tao/ORB.h: + +commit 97364bb7c541e2709321272443949cd22d0f9686 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Feb 10 09:44:35 2020 +0100 + + Make ACE/TAO 6.5.8/2.5.8 public and prepare for next release + + * ACE/NEWS: + * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: + * ACE/docs/Download.html: + * ACE/docs/bczar/bczar.html: + * ACE/etc/index.html: + * TAO/NEWS: @@ -1,6 +1,19 @@ +USER VISIBLE CHANGES BETWEEN TAO-2.5.9 and TAO-2.5.10 +===================================================== + +. TAO IDL Frontend annotation support extended: (#1125) + . All the direct contents of interfaces + . Porttypes, eventtypes, components, and all their direct contents + . Valuetypes and most of their direct contents + +. TAO IDL now supports anonymous types when using IDL4. (#1135) + USER VISIBLE CHANGES BETWEEN TAO-2.5.8 and TAO-2.5.9 ==================================================== +. With C++11 we are now using (u)int8/16/32/64 to map all + CORBA types + USER VISIBLE CHANGES BETWEEN TAO-2.5.7 and TAO-2.5.8 ==================================================== diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM index fdcbead859c..95190651d64 100644 --- a/TAO/PROBLEM-REPORT-FORM +++ b/TAO/PROBLEM-REPORT-FORM @@ -2,19 +2,19 @@ reports, etc., to the TAO developers and interested users. Send it to tao-bugs@list.isis.vanderbilt.edu, you must be subscribed to the list in order to be able to post to it. If you are using OCI - or PrismTech's versions of TAO do not send bugs to this mailing list, but + or MicroFocus's versions of TAO do not send bugs to this mailing list, but instead contact those companies for support. Please also send your PRF as plain ASCII text, _not_ uuencoded or as an attachment. - We prefer that all bug reports be submitted through our bug tracking - system. See $ACE_ROOT/docs/usage-bugzilla.html for more information + We prefer that all bug reports be submitted through github issues. + See https://github.com/DOCGroup/ACE_TAO/issues for more information about how to do this. If you are unsure as to whether your problem is a real bug or not then please submit your question to the mailing list using the following form. Not using the problem report form will make it harder or impossible to identify the problem, and in many cases we will be unable to help at all. Also please try to - browse bugzilla and the ChangeLog files to find out if your problem - has been solved in a more recent version of TAO. + browse the existing github isssues and the ChangeLog files to find + out if your problem has been solved in a more recent version of TAO. To subscribe to the list see https://www.dre.vanderbilt.edu/~schmidt/ACE-mail.html @@ -40,8 +40,8 @@ To: tao-bugs@list.isis.vanderbilt.edu Subject: [area]: [synopsis] - TAO VERSION: 2.5.8 - ACE VERSION: 6.5.8 + TAO VERSION: 2.5.9 + ACE VERSION: 6.5.9 HOST MACHINE and OPERATING SYSTEM: If on Windows based OS's, which version of WINSOCK do you diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html index abff56cc898..a13c716489f 100644 --- a/TAO/TAO-INSTALL.html +++ b/TAO/TAO-INSTALL.html @@ -69,11 +69,11 @@ enhancement requests through <a href="https://github.com/DOCGroup/ACE_TAO">github</a>.<P> TAO can be obtained <A -HREF="http://download.dre.vanderbilt.edu">electronically</A> +HREF="https://download.dre.vanderbilt.edu">electronically</A> via the WWW and ftp. <A -HREF="http://www.dre.vanderbilt.edu/TAO">TAO</A> is bundled +HREF="https://www.dre.vanderbilt.edu/TAO">TAO</A> is bundled with the <A -HREF="http://www.dre.vanderbilt.edu/ACE"> ACE </A> release. You'll +HREF="https://www.dre.vanderbilt.edu/ACE"> ACE </A> release. You'll always need the most recent version of ACE because TAO tracks and influences changes to ACE. Always use the ACE+TAO release bundle as a single piece instead of trying to mix and match things up.<P> @@ -534,7 +534,7 @@ quickly. <LI>Please make sure that you have <a href="http://www.perl.org"> perl</a> installed, preferably perl 5.8 or higher. Users on Win32 based platforms are recommended to use - <a href="http://www.activestate.com/Products/ActivePerl/"> Active + <a href="https://www.activestate.com/products/perl"> Active State Perl </a>. We use active state perl without problems. We have ran into problems trying to use the cygwin version of perl on Win32 based platforms.</LI><p/> diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp index 81411d16f63..96a46df6707 100644 --- a/TAO/TAO_IDL/ast/ast_decl.cpp +++ b/TAO/TAO_IDL/ast/ast_decl.cpp @@ -62,27 +62,27 @@ trademarks or registered trademarks of Sun Microsystems, Inc. */ -#include "ast_interface.h" -#include "ast_module.h" -#include "ast_array.h" -#include "ast_field.h" -#include "ast_structure.h" -#include "ast_sequence.h" -#include "ast_string.h" -#include "ast_typedef.h" -#include "ast_visitor.h" -#include "global_extern.h" -#include "nr_extern.h" -#include "utl_identifier.h" -#include "utl_string.h" -#include "utl_scope.h" -#include "utl_err.h" -#include "ace/OS_NS_stdio.h" -#include "ast_annotation_appl.h" -#include "utl_indenter.h" +#include <ast_interface.h> +#include <ast_module.h> +#include <ast_array.h> +#include <ast_field.h> +#include <ast_structure.h> +#include <ast_sequence.h> +#include <ast_string.h> +#include <ast_typedef.h> +#include <ast_visitor.h> +#include <global_extern.h> +#include <nr_extern.h> +#include <utl_identifier.h> +#include <utl_string.h> +#include <utl_scope.h> +#include <utl_err.h> +#include <ast_annotation_appl.h> +#include <utl_indenter.h> // FUZZ: disable check_for_streams_include -#include "ace/streams.h" +#include <ace/streams.h> +#include <ace/OS_NS_stdio.h> COMMON_Base::COMMON_Base (bool local, bool abstract) @@ -1643,7 +1643,7 @@ operator<< (ACE_OSTREAM_TYPE &o, AST_Decl &d) bool AST_Decl::annotatable () const { - return false; + return true; } bool diff --git a/TAO/TAO_IDL/be/be_helper.cpp b/TAO/TAO_IDL/be/be_helper.cpp index 0a48b3e84d8..b62ed54a062 100644 --- a/TAO/TAO_IDL/be/be_helper.cpp +++ b/TAO/TAO_IDL/be/be_helper.cpp @@ -370,7 +370,7 @@ TAO_OutStream & TAO_OutStream::operator<< (const ACE_CDR::ULongLong num) { ACE_OS::fprintf (this->fp_, - ACE_TEXT_ALWAYS_CHAR (ACE_UINT64_FORMAT_SPECIFIER), + ACE_UINT64_FORMAT_SPECIFIER_ASCII, num); return *this; @@ -380,7 +380,7 @@ TAO_OutStream & TAO_OutStream::operator<< (const ACE_CDR::LongLong num) { ACE_OS::fprintf (this->fp_, - ACE_TEXT_ALWAYS_CHAR (ACE_INT64_FORMAT_SPECIFIER), + ACE_INT64_FORMAT_SPECIFIER_ASCII, num); return *this; diff --git a/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp b/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp index aab6cd523fc..9a16e7d7ced 100644 --- a/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp @@ -109,26 +109,12 @@ be_visitor_any_extracted_type_decl::visit_predefined_type ( << " (" << tmp_name_ << ");"; break; case AST_PredefinedType::PT_short: - os_ << var_name_ << " = 0;"; - break; case AST_PredefinedType::PT_ushort: - os_ << var_name_ << " = 0;"; - break; case AST_PredefinedType::PT_long: - os_ << var_name_ << " = 0;"; - break; case AST_PredefinedType::PT_ulong: - os_ << var_name_ << " = 0;"; - break; case AST_PredefinedType::PT_longlong: - os_ << var_name_ << " = ACE_CDR_LONGLONG_INITIALIZER;"; - break; case AST_PredefinedType::PT_ulonglong: - os_ << var_name_ << " = 0;"; - break; case AST_PredefinedType::PT_float: - os_ << var_name_ << " = 0;"; - break; case AST_PredefinedType::PT_double: os_ << var_name_ << " = 0;"; break; diff --git a/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp index 34abde8febe..0bf36459e38 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp @@ -236,10 +236,8 @@ int be_visitor_args_vardecl_ss::visit_predefined_type ( case AST_PredefinedType::PT_float: case AST_PredefinedType::PT_double: case AST_PredefinedType::PT_octet: - *os << " = 0"; - break; case AST_PredefinedType::PT_longlong: - *os << " = ACE_CDR_LONGLONG_INITIALIZER"; + *os << " = 0"; break; case AST_PredefinedType::PT_longdouble: *os << " = ACE_CDR_LONG_DOUBLE_INITIALIZER"; diff --git a/TAO/TAO_IDL/be/be_visitor_attr_init.cpp b/TAO/TAO_IDL/be/be_visitor_attr_init.cpp index 3667347c681..5808490dcfc 100644 --- a/TAO/TAO_IDL/be/be_visitor_attr_init.cpp +++ b/TAO/TAO_IDL/be/be_visitor_attr_init.cpp @@ -79,14 +79,12 @@ be_visitor_attr_init::visit_predefined_type (be_predefined_type *node) case AST_PredefinedType::PT_ushort: case AST_PredefinedType::PT_long: case AST_PredefinedType::PT_ulong: + case AST_PredefinedType::PT_longlong: case AST_PredefinedType::PT_ulonglong: case AST_PredefinedType::PT_value: case AST_PredefinedType::PT_any: os_ << "0"; break; - case AST_PredefinedType::PT_longlong: - os_ << "ACE_CDR_LONGLONG_INITIALIZER"; - break; case AST_PredefinedType::PT_float: os_ << "0.0f"; break; diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp index e72e278c159..37275aabd0d 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp @@ -288,6 +288,7 @@ be_visitor_connector_dds_exh::gen_dds_traits (AST_Decl *datatype) os_ << be_nl << "struct " << datatype->flat_name () << "_DDS_Traits" << be_nl << "{" << be_idt_nl + << "static const char* get_type_name () { return \"" << dt_name << "\"; };" << be_nl << "typedef ::" << dt_name << " value_type;" << be_nl << "typedef ::" << dt_name; diff --git a/TAO/TAO_IDL/be/be_visitor_null_return_value.cpp b/TAO/TAO_IDL/be/be_visitor_null_return_value.cpp index 6965580b91d..91c17cabbbb 100644 --- a/TAO/TAO_IDL/be/be_visitor_null_return_value.cpp +++ b/TAO/TAO_IDL/be/be_visitor_null_return_value.cpp @@ -85,14 +85,12 @@ be_visitor_null_return_value::visit_predefined_type (be_predefined_type *node) case AST_PredefinedType::PT_ushort: case AST_PredefinedType::PT_long: case AST_PredefinedType::PT_ulong: + case AST_PredefinedType::PT_longlong: case AST_PredefinedType::PT_ulonglong: case AST_PredefinedType::PT_value: case AST_PredefinedType::PT_any: os_ << "0"; break; - case AST_PredefinedType::PT_longlong: - os_ << "ACE_CDR_LONGLONG_INITIALIZER"; - break; case AST_PredefinedType::PT_float: os_ << "0.0f"; break; diff --git a/TAO/TAO_IDL/be_include/be_helper.h b/TAO/TAO_IDL/be_include/be_helper.h index 0a87324c984..eca14482979 100644 --- a/TAO/TAO_IDL/be_include/be_helper.h +++ b/TAO/TAO_IDL/be_include/be_helper.h @@ -17,6 +17,11 @@ #include "ace/CDR_Base.h" #include "ace/SString.h" +#if defined (ACE_HAS_CPP11) +#include "ace/OS_NS_stdio.h" +#include <type_traits> +#endif /* ACE_HAS_CPP11 */ + class Identifier; class UTL_IdList; class AST_Expression; @@ -167,6 +172,22 @@ public: int gen_endif (void); // =overloaded operators +#if defined (ACE_HAS_CPP11) + // Avoid duplication for the underlying type of size_t + template <typename Dummy = TAO_OutStream &> + typename std::enable_if<std::is_same<Dummy, TAO_OutStream &>::value && + !std::is_same<ACE_CDR::ULongLong, size_t>::value && + !std::is_same<ACE_CDR::ULong, size_t>::value, + TAO_OutStream &>::type + operator << (const size_t num) + { + ACE_OS::fprintf (this->fp_, + ACE_SIZE_T_FORMAT_SPECIFIER_ASCII, + num); + + return *this; + } +#endif /* ACE_HAS_CPP11 */ TAO_OutStream &operator<< (const char *str); TAO_OutStream &operator<< (const ACE_CString &str); diff --git a/TAO/TAO_IDL/docs/annotations.md b/TAO/TAO_IDL/docs/annotations.md index 86c8d5e6975..7dd447a5b01 100644 --- a/TAO/TAO_IDL/docs/annotations.md +++ b/TAO/TAO_IDL/docs/annotations.md @@ -27,6 +27,7 @@ compiler that uses `tao_idl`.** * [TAO 2.5.5](#tao-255) * [TAO 2.5.6](#tao-256) * [TAO 2.5.7](#tao-257) + * [TAO 2.5.10](#tao-2510) ## IDL Annotations @@ -95,7 +96,13 @@ TAO IDL's front-end library can read them: - structures and their member values - unions and their cases - enumerations and their enumerators -- interfaces and their operations and attributes +- interfaces, porttypes, eventtypes, components and all of their direct + contents +- valuetypes and most of their direct contents with the exception of these + kinds of valuetype statements: + - import: not supported by TAO + - typeid: not supported by TAO within valuetypes + - typeprefix: No corresponding AST Node to attach annotations to These are the general cases. The rest of the cases are defined in the next section. If an annotation application isn't listed in the general case list or @@ -603,3 +610,10 @@ annotation member names with `_cxx_` if they are also a C++ keyword. - Expanded documentation on what can be annotated and how to extend annotation support. + +### TAO 2.5.10 + +- Annotation support extended: + - All the direct contents of interfaces + - The porttypes, eventtypes, components and all their direct contents + - Valuetypes and most of their direct contents diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll index fde9c3776ce..69bc94d48bd 100644 --- a/TAO/TAO_IDL/fe/idl.ll +++ b/TAO/TAO_IDL/fe/idl.ll @@ -971,7 +971,7 @@ idl_store_pragma (char *buf) static ACE_CDR::LongLong idl_atoi (char *s, long b) { - ACE_CDR::LongLong r = ACE_CDR_LONGLONG_INITIALIZER; + ACE_CDR::LongLong r = 0; // Skip over the dash and possibly spaces after the dash while (*s == '-' || *s == ' ' || *s == '\t') diff --git a/TAO/TAO_IDL/fe/idl.tab.cpp b/TAO/TAO_IDL/fe/idl.tab.cpp index 6dc65a170d7..5fecde985c4 100644 --- a/TAO/TAO_IDL/fe/idl.tab.cpp +++ b/TAO/TAO_IDL/fe/idl.tab.cpp @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 3.4. */ +/* A Bison parser, made by GNU Bison 3.6.2. */ /* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation, + Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -34,6 +34,10 @@ /* C LALR(1) parser skeleton written by Richard Stallman, by simplifying the original so-called "semantic" parser. */ +/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual, + especially those whose name start with YY_ or yy_. They are + private implementation details that can be changed or removed. */ + /* All symbols defined below should begin with yy or YY, to avoid infringing on user name space. This should be done even for local variables, as they might otherwise be expanded by user macros. @@ -41,14 +45,11 @@ define necessary library symbols; they are noted "INFRINGES ON USER NAME SPACE" below. */ -/* Undocumented macros, especially those whose name start with YY_, - are private implementation details. Do not rely on them. */ - /* Identify Bison output. */ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "3.4" +#define YYBISON_VERSION "3.6.2" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -69,80 +70,80 @@ #define yyerror tao_yyerror #define yydebug tao_yydebug #define yynerrs tao_yynerrs - #define yylval tao_yylval #define yychar tao_yychar /* First part of user prologue. */ #line 72 "fe/idl.ypp" -#include "utl_identifier.h" -#include "utl_err.h" -#include "utl_string.h" -#include "utl_strlist.h" -#include "utl_namelist.h" -#include "utl_exprlist.h" -#include "utl_labellist.h" -#include "utl_decllist.h" - -#include "global_extern.h" -#include "nr_extern.h" - -#include "ast_argument.h" -#include "ast_array.h" -#include "ast_attribute.h" -#include "ast_field.h" -#include "ast_fixed.h" -#include "ast_expression.h" -#include "ast_operation.h" -#include "ast_generator.h" -#include "ast_template_module.h" -#include "ast_template_module_inst.h" -#include "ast_template_module_ref.h" -#include "ast_typedef.h" -#include "ast_valuebox.h" -#include "ast_valuetype.h" -#include "ast_valuetype_fwd.h" -#include "ast_eventtype.h" -#include "ast_eventtype_fwd.h" -#include "ast_component.h" -#include "ast_component_fwd.h" -#include "ast_home.h" -#include "ast_porttype.h" -#include "ast_connector.h" -#include "ast_uses.h" -#include "ast_constant.h" -#include "ast_union.h" -#include "ast_union_fwd.h" -#include "ast_structure_fwd.h" -#include "ast_extern.h" -#include "ast_enum.h" -#include "ast_root.h" -#include "ast_sequence.h" -#include "ast_string.h" -#include "ast_factory.h" -#include "ast_finder.h" -#include "ast_exception.h" -#include "ast_param_holder.h" -#include "ast_visitor_tmpl_module_inst.h" -#include "ast_visitor_tmpl_module_ref.h" -#include "ast_visitor_context.h" -#include "ast_annotation_appl.h" -#include "ast_union_branch.h" -#include "ast_enum_val.h" -#include "ast_annotation_member.h" - -#include "fe_declarator.h" -#include "fe_interface_header.h" -#include "fe_obv_header.h" -#include "fe_component_header.h" -#include "fe_home_header.h" -#include "fe_utils.h" - -#if (defined(apollo) || defined(hpux)) && defined(__cplusplus) -extern "C" int tao_yywrap(); -#endif // (defined(apollo) || defined(hpux)) && defined(__cplusplus) - +#include <utl_identifier.h> +#include <utl_err.h> +#include <utl_string.h> +#include <utl_strlist.h> +#include <utl_namelist.h> +#include <utl_exprlist.h> +#include <utl_labellist.h> +#include <utl_decllist.h> + +#include <global_extern.h> +#include <nr_extern.h> + +#include <ast_argument.h> +#include <ast_array.h> +#include <ast_attribute.h> +#include <ast_field.h> +#include <ast_fixed.h> +#include <ast_expression.h> +#include <ast_operation.h> +#include <ast_generator.h> +#include <ast_template_module.h> +#include <ast_template_module_inst.h> +#include <ast_template_module_ref.h> +#include <ast_typedef.h> +#include <ast_valuebox.h> +#include <ast_valuetype.h> +#include <ast_valuetype_fwd.h> +#include <ast_eventtype.h> +#include <ast_eventtype_fwd.h> +#include <ast_component.h> +#include <ast_component_fwd.h> +#include <ast_home.h> +#include <ast_porttype.h> +#include <ast_connector.h> +#include <ast_uses.h> +#include <ast_constant.h> +#include <ast_union.h> +#include <ast_union_fwd.h> +#include <ast_structure_fwd.h> +#include <ast_extern.h> +#include <ast_enum.h> +#include <ast_root.h> +#include <ast_sequence.h> +#include <ast_string.h> +#include <ast_factory.h> +#include <ast_finder.h> +#include <ast_exception.h> +#include <ast_param_holder.h> +#include <ast_visitor_tmpl_module_inst.h> +#include <ast_visitor_tmpl_module_ref.h> +#include <ast_visitor_context.h> +#include <ast_annotation_appl.h> +#include <ast_union_branch.h> +#include <ast_enum_val.h> +#include <ast_annotation_member.h> +#include <ast_provides.h> +#include <ast_emits.h> +#include <ast_publishes.h> +#include <ast_consumes.h> +#include <ast_extended_port.h> +#include <ast_mirror_port.h> + +#include <fe_declarator.h> +#include <fe_interface_header.h> +#include <fe_obv_header.h> +#include <fe_component_header.h> +#include <fe_home_header.h> +#include <fe_utils.h> void tao_yyerror (const char *); int tao_yylex (void); @@ -160,8 +161,17 @@ bool stack_based_lookup_for_primary_expr = false; // Compile Optional Tracing Output for Parser, can be enabled with --bison-trace #define YYDEBUG 1 -#line 164 "fe/idl.tab.cpp" +#line 165 "fe/idl.tab.cpp" +# ifndef YY_CAST +# ifdef __cplusplus +# define YY_CAST(Type, Val) static_cast<Type> (Val) +# define YY_REINTERPRET_CAST(Type, Val) reinterpret_cast<Type> (Val) +# else +# define YY_CAST(Type, Val) ((Type) (Val)) +# define YY_REINTERPRET_CAST(Type, Val) ((Type) (Val)) +# endif +# endif # ifndef YY_NULLPTR # if defined __cplusplus # if 201103L <= __cplusplus @@ -174,14 +184,6 @@ bool stack_based_lookup_for_primary_expr = false; # endif # endif -/* Enabling verbose error messages. */ -#ifdef YYERROR_VERBOSE -# undef YYERROR_VERBOSE -# define YYERROR_VERBOSE 1 -#else -# define YYERROR_VERBOSE 0 -#endif - /* Use api.header.include to #include this header instead of duplicating it here. */ #ifndef YY_TAO_YY_FE_IDL_TAB_HPP_INCLUDED @@ -194,104 +196,109 @@ bool stack_based_lookup_for_primary_expr = false; extern int tao_yydebug; #endif -/* Token type. */ +/* Token kinds. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE enum yytokentype { - IDENTIFIER = 258, - IDL_CONST = 259, - IDL_MODULE = 260, - IDL_INTERFACE = 261, - IDL_TYPEDEF = 262, - IDL_LONG = 263, - IDL_SHORT = 264, - IDL_UNSIGNED = 265, - IDL_DOUBLE = 266, - IDL_FLOAT = 267, - IDL_CHAR = 268, - IDL_WCHAR = 269, - IDL_OCTET = 270, - IDL_BOOLEAN = 271, - IDL_FIXED = 272, - IDL_ANY = 273, - IDL_OBJECT = 274, - IDL_STRUCT = 275, - IDL_UNION = 276, - IDL_SWITCH = 277, - IDL_ENUM = 278, - IDL_SEQUENCE = 279, - IDL_STRING = 280, - IDL_WSTRING = 281, - IDL_EXCEPTION = 282, - IDL_CASE = 283, - IDL_DEFAULT = 284, - IDL_READONLY = 285, - IDL_ATTRIBUTE = 286, - IDL_ONEWAY = 287, - IDL_IDEMPOTENT = 288, - IDL_VOID = 289, - IDL_IN = 290, - IDL_OUT = 291, - IDL_INOUT = 292, - IDL_RAISES = 293, - IDL_CONTEXT = 294, - IDL_NATIVE = 295, - IDL_LOCAL = 296, - IDL_ABSTRACT = 297, - IDL_CUSTOM = 298, - IDL_FACTORY = 299, - IDL_PRIVATE = 300, - IDL_PUBLIC = 301, - IDL_SUPPORTS = 302, - IDL_TRUNCATABLE = 303, - IDL_VALUETYPE = 304, - IDL_COMPONENT = 305, - IDL_CONSUMES = 306, - IDL_EMITS = 307, - IDL_EVENTTYPE = 308, - IDL_FINDER = 309, - IDL_GETRAISES = 310, - IDL_HOME = 311, - IDL_IMPORT = 312, - IDL_MULTIPLE = 313, - IDL_PRIMARYKEY = 314, - IDL_PROVIDES = 315, - IDL_PUBLISHES = 316, - IDL_SETRAISES = 317, - IDL_TYPEID = 318, - IDL_TYPEPREFIX = 319, - IDL_USES = 320, - IDL_MANAGES = 321, - IDL_TYPENAME = 322, - IDL_PORT = 323, - IDL_MIRRORPORT = 324, - IDL_PORTTYPE = 325, - IDL_CONNECTOR = 326, - IDL_ALIAS = 327, - IDL_INTEGER_LITERAL = 328, - IDL_UINTEGER_LITERAL = 329, - IDL_STRING_LITERAL = 330, - IDL_CHARACTER_LITERAL = 331, - IDL_FLOATING_PT_LITERAL = 332, - IDL_FIXED_PT_LITERAL = 333, - IDL_TRUETOK = 334, - IDL_FALSETOK = 335, - IDL_SCOPE_DELIMITOR = 336, - IDL_LEFT_SHIFT = 337, - IDL_RIGHT_SHIFT = 338, - IDL_WCHAR_LITERAL = 339, - IDL_WSTRING_LITERAL = 340, - IDL_ANNOTATION_DECL = 341, - IDL_ANNOTATION_SYMBOL = 342 + YYEMPTY = -2, + YYEOF = 0, /* "end of file" */ + YYerror = 256, /* error */ + YYUNDEF = 257, /* "invalid token" */ + IDENTIFIER = 258, /* IDENTIFIER */ + IDL_CONST = 259, /* IDL_CONST */ + IDL_MODULE = 260, /* IDL_MODULE */ + IDL_INTERFACE = 261, /* IDL_INTERFACE */ + IDL_TYPEDEF = 262, /* IDL_TYPEDEF */ + IDL_LONG = 263, /* IDL_LONG */ + IDL_SHORT = 264, /* IDL_SHORT */ + IDL_UNSIGNED = 265, /* IDL_UNSIGNED */ + IDL_DOUBLE = 266, /* IDL_DOUBLE */ + IDL_FLOAT = 267, /* IDL_FLOAT */ + IDL_CHAR = 268, /* IDL_CHAR */ + IDL_WCHAR = 269, /* IDL_WCHAR */ + IDL_OCTET = 270, /* IDL_OCTET */ + IDL_BOOLEAN = 271, /* IDL_BOOLEAN */ + IDL_FIXED = 272, /* IDL_FIXED */ + IDL_ANY = 273, /* IDL_ANY */ + IDL_OBJECT = 274, /* IDL_OBJECT */ + IDL_STRUCT = 275, /* IDL_STRUCT */ + IDL_UNION = 276, /* IDL_UNION */ + IDL_SWITCH = 277, /* IDL_SWITCH */ + IDL_ENUM = 278, /* IDL_ENUM */ + IDL_SEQUENCE = 279, /* IDL_SEQUENCE */ + IDL_STRING = 280, /* IDL_STRING */ + IDL_WSTRING = 281, /* IDL_WSTRING */ + IDL_EXCEPTION = 282, /* IDL_EXCEPTION */ + IDL_CASE = 283, /* IDL_CASE */ + IDL_DEFAULT = 284, /* IDL_DEFAULT */ + IDL_READONLY = 285, /* IDL_READONLY */ + IDL_ATTRIBUTE = 286, /* IDL_ATTRIBUTE */ + IDL_ONEWAY = 287, /* IDL_ONEWAY */ + IDL_IDEMPOTENT = 288, /* IDL_IDEMPOTENT */ + IDL_VOID = 289, /* IDL_VOID */ + IDL_IN = 290, /* IDL_IN */ + IDL_OUT = 291, /* IDL_OUT */ + IDL_INOUT = 292, /* IDL_INOUT */ + IDL_RAISES = 293, /* IDL_RAISES */ + IDL_CONTEXT = 294, /* IDL_CONTEXT */ + IDL_NATIVE = 295, /* IDL_NATIVE */ + IDL_LOCAL = 296, /* IDL_LOCAL */ + IDL_ABSTRACT = 297, /* IDL_ABSTRACT */ + IDL_CUSTOM = 298, /* IDL_CUSTOM */ + IDL_FACTORY = 299, /* IDL_FACTORY */ + IDL_PRIVATE = 300, /* IDL_PRIVATE */ + IDL_PUBLIC = 301, /* IDL_PUBLIC */ + IDL_SUPPORTS = 302, /* IDL_SUPPORTS */ + IDL_TRUNCATABLE = 303, /* IDL_TRUNCATABLE */ + IDL_VALUETYPE = 304, /* IDL_VALUETYPE */ + IDL_COMPONENT = 305, /* IDL_COMPONENT */ + IDL_CONSUMES = 306, /* IDL_CONSUMES */ + IDL_EMITS = 307, /* IDL_EMITS */ + IDL_EVENTTYPE = 308, /* IDL_EVENTTYPE */ + IDL_FINDER = 309, /* IDL_FINDER */ + IDL_GETRAISES = 310, /* IDL_GETRAISES */ + IDL_HOME = 311, /* IDL_HOME */ + IDL_IMPORT = 312, /* IDL_IMPORT */ + IDL_MULTIPLE = 313, /* IDL_MULTIPLE */ + IDL_PRIMARYKEY = 314, /* IDL_PRIMARYKEY */ + IDL_PROVIDES = 315, /* IDL_PROVIDES */ + IDL_PUBLISHES = 316, /* IDL_PUBLISHES */ + IDL_SETRAISES = 317, /* IDL_SETRAISES */ + IDL_TYPEID = 318, /* IDL_TYPEID */ + IDL_TYPEPREFIX = 319, /* IDL_TYPEPREFIX */ + IDL_USES = 320, /* IDL_USES */ + IDL_MANAGES = 321, /* IDL_MANAGES */ + IDL_TYPENAME = 322, /* IDL_TYPENAME */ + IDL_PORT = 323, /* IDL_PORT */ + IDL_MIRRORPORT = 324, /* IDL_MIRRORPORT */ + IDL_PORTTYPE = 325, /* IDL_PORTTYPE */ + IDL_CONNECTOR = 326, /* IDL_CONNECTOR */ + IDL_ALIAS = 327, /* IDL_ALIAS */ + IDL_INTEGER_LITERAL = 328, /* IDL_INTEGER_LITERAL */ + IDL_UINTEGER_LITERAL = 329, /* IDL_UINTEGER_LITERAL */ + IDL_STRING_LITERAL = 330, /* IDL_STRING_LITERAL */ + IDL_CHARACTER_LITERAL = 331, /* IDL_CHARACTER_LITERAL */ + IDL_FLOATING_PT_LITERAL = 332, /* IDL_FLOATING_PT_LITERAL */ + IDL_FIXED_PT_LITERAL = 333, /* IDL_FIXED_PT_LITERAL */ + IDL_TRUETOK = 334, /* IDL_TRUETOK */ + IDL_FALSETOK = 335, /* IDL_FALSETOK */ + IDL_SCOPE_DELIMITOR = 336, /* IDL_SCOPE_DELIMITOR */ + IDL_LEFT_SHIFT = 337, /* IDL_LEFT_SHIFT */ + IDL_RIGHT_SHIFT = 338, /* IDL_RIGHT_SHIFT */ + IDL_WCHAR_LITERAL = 339, /* IDL_WCHAR_LITERAL */ + IDL_WSTRING_LITERAL = 340, /* IDL_WSTRING_LITERAL */ + IDL_ANNOTATION_DECL = 341, /* IDL_ANNOTATION_DECL */ + IDL_ANNOTATION_SYMBOL = 342 /* IDL_ANNOTATION_SYMBOL */ }; + typedef enum yytokentype yytoken_kind_t; #endif /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED union YYSTYPE { -#line 162 "fe/idl.ypp" +#line 163 "fe/idl.ypp" AST_Decl *dcval; /* Decl value */ UTL_StrList *slval; /* String list */ @@ -336,7 +343,7 @@ union YYSTYPE AST_Decls *decls_val; Decl_Annotations_Pair *decl_annotations_pair_val; -#line 340 "fe/idl.tab.cpp" +#line 347 "fe/idl.tab.cpp" }; typedef union YYSTYPE YYSTYPE; @@ -350,6 +357,520 @@ extern YYSTYPE tao_yylval; int tao_yyparse (void); #endif /* !YY_TAO_YY_FE_IDL_TAB_HPP_INCLUDED */ +/* Symbol kind. */ +enum yysymbol_kind_t +{ + YYSYMBOL_YYEMPTY = -2, + YYSYMBOL_YYEOF = 0, /* "end of file" */ + YYSYMBOL_YYerror = 1, /* error */ + YYSYMBOL_YYUNDEF = 2, /* "invalid token" */ + YYSYMBOL_IDENTIFIER = 3, /* IDENTIFIER */ + YYSYMBOL_IDL_CONST = 4, /* IDL_CONST */ + YYSYMBOL_IDL_MODULE = 5, /* IDL_MODULE */ + YYSYMBOL_IDL_INTERFACE = 6, /* IDL_INTERFACE */ + YYSYMBOL_IDL_TYPEDEF = 7, /* IDL_TYPEDEF */ + YYSYMBOL_IDL_LONG = 8, /* IDL_LONG */ + YYSYMBOL_IDL_SHORT = 9, /* IDL_SHORT */ + YYSYMBOL_IDL_UNSIGNED = 10, /* IDL_UNSIGNED */ + YYSYMBOL_IDL_DOUBLE = 11, /* IDL_DOUBLE */ + YYSYMBOL_IDL_FLOAT = 12, /* IDL_FLOAT */ + YYSYMBOL_IDL_CHAR = 13, /* IDL_CHAR */ + YYSYMBOL_IDL_WCHAR = 14, /* IDL_WCHAR */ + YYSYMBOL_IDL_OCTET = 15, /* IDL_OCTET */ + YYSYMBOL_IDL_BOOLEAN = 16, /* IDL_BOOLEAN */ + YYSYMBOL_IDL_FIXED = 17, /* IDL_FIXED */ + YYSYMBOL_IDL_ANY = 18, /* IDL_ANY */ + YYSYMBOL_IDL_OBJECT = 19, /* IDL_OBJECT */ + YYSYMBOL_IDL_STRUCT = 20, /* IDL_STRUCT */ + YYSYMBOL_IDL_UNION = 21, /* IDL_UNION */ + YYSYMBOL_IDL_SWITCH = 22, /* IDL_SWITCH */ + YYSYMBOL_IDL_ENUM = 23, /* IDL_ENUM */ + YYSYMBOL_IDL_SEQUENCE = 24, /* IDL_SEQUENCE */ + YYSYMBOL_IDL_STRING = 25, /* IDL_STRING */ + YYSYMBOL_IDL_WSTRING = 26, /* IDL_WSTRING */ + YYSYMBOL_IDL_EXCEPTION = 27, /* IDL_EXCEPTION */ + YYSYMBOL_IDL_CASE = 28, /* IDL_CASE */ + YYSYMBOL_IDL_DEFAULT = 29, /* IDL_DEFAULT */ + YYSYMBOL_IDL_READONLY = 30, /* IDL_READONLY */ + YYSYMBOL_IDL_ATTRIBUTE = 31, /* IDL_ATTRIBUTE */ + YYSYMBOL_IDL_ONEWAY = 32, /* IDL_ONEWAY */ + YYSYMBOL_IDL_IDEMPOTENT = 33, /* IDL_IDEMPOTENT */ + YYSYMBOL_IDL_VOID = 34, /* IDL_VOID */ + YYSYMBOL_IDL_IN = 35, /* IDL_IN */ + YYSYMBOL_IDL_OUT = 36, /* IDL_OUT */ + YYSYMBOL_IDL_INOUT = 37, /* IDL_INOUT */ + YYSYMBOL_IDL_RAISES = 38, /* IDL_RAISES */ + YYSYMBOL_IDL_CONTEXT = 39, /* IDL_CONTEXT */ + YYSYMBOL_IDL_NATIVE = 40, /* IDL_NATIVE */ + YYSYMBOL_IDL_LOCAL = 41, /* IDL_LOCAL */ + YYSYMBOL_IDL_ABSTRACT = 42, /* IDL_ABSTRACT */ + YYSYMBOL_IDL_CUSTOM = 43, /* IDL_CUSTOM */ + YYSYMBOL_IDL_FACTORY = 44, /* IDL_FACTORY */ + YYSYMBOL_IDL_PRIVATE = 45, /* IDL_PRIVATE */ + YYSYMBOL_IDL_PUBLIC = 46, /* IDL_PUBLIC */ + YYSYMBOL_IDL_SUPPORTS = 47, /* IDL_SUPPORTS */ + YYSYMBOL_IDL_TRUNCATABLE = 48, /* IDL_TRUNCATABLE */ + YYSYMBOL_IDL_VALUETYPE = 49, /* IDL_VALUETYPE */ + YYSYMBOL_IDL_COMPONENT = 50, /* IDL_COMPONENT */ + YYSYMBOL_IDL_CONSUMES = 51, /* IDL_CONSUMES */ + YYSYMBOL_IDL_EMITS = 52, /* IDL_EMITS */ + YYSYMBOL_IDL_EVENTTYPE = 53, /* IDL_EVENTTYPE */ + YYSYMBOL_IDL_FINDER = 54, /* IDL_FINDER */ + YYSYMBOL_IDL_GETRAISES = 55, /* IDL_GETRAISES */ + YYSYMBOL_IDL_HOME = 56, /* IDL_HOME */ + YYSYMBOL_IDL_IMPORT = 57, /* IDL_IMPORT */ + YYSYMBOL_IDL_MULTIPLE = 58, /* IDL_MULTIPLE */ + YYSYMBOL_IDL_PRIMARYKEY = 59, /* IDL_PRIMARYKEY */ + YYSYMBOL_IDL_PROVIDES = 60, /* IDL_PROVIDES */ + YYSYMBOL_IDL_PUBLISHES = 61, /* IDL_PUBLISHES */ + YYSYMBOL_IDL_SETRAISES = 62, /* IDL_SETRAISES */ + YYSYMBOL_IDL_TYPEID = 63, /* IDL_TYPEID */ + YYSYMBOL_IDL_TYPEPREFIX = 64, /* IDL_TYPEPREFIX */ + YYSYMBOL_IDL_USES = 65, /* IDL_USES */ + YYSYMBOL_IDL_MANAGES = 66, /* IDL_MANAGES */ + YYSYMBOL_IDL_TYPENAME = 67, /* IDL_TYPENAME */ + YYSYMBOL_IDL_PORT = 68, /* IDL_PORT */ + YYSYMBOL_IDL_MIRRORPORT = 69, /* IDL_MIRRORPORT */ + YYSYMBOL_IDL_PORTTYPE = 70, /* IDL_PORTTYPE */ + YYSYMBOL_IDL_CONNECTOR = 71, /* IDL_CONNECTOR */ + YYSYMBOL_IDL_ALIAS = 72, /* IDL_ALIAS */ + YYSYMBOL_IDL_INTEGER_LITERAL = 73, /* IDL_INTEGER_LITERAL */ + YYSYMBOL_IDL_UINTEGER_LITERAL = 74, /* IDL_UINTEGER_LITERAL */ + YYSYMBOL_IDL_STRING_LITERAL = 75, /* IDL_STRING_LITERAL */ + YYSYMBOL_IDL_CHARACTER_LITERAL = 76, /* IDL_CHARACTER_LITERAL */ + YYSYMBOL_IDL_FLOATING_PT_LITERAL = 77, /* IDL_FLOATING_PT_LITERAL */ + YYSYMBOL_IDL_FIXED_PT_LITERAL = 78, /* IDL_FIXED_PT_LITERAL */ + YYSYMBOL_IDL_TRUETOK = 79, /* IDL_TRUETOK */ + YYSYMBOL_IDL_FALSETOK = 80, /* IDL_FALSETOK */ + YYSYMBOL_IDL_SCOPE_DELIMITOR = 81, /* IDL_SCOPE_DELIMITOR */ + YYSYMBOL_IDL_LEFT_SHIFT = 82, /* IDL_LEFT_SHIFT */ + YYSYMBOL_IDL_RIGHT_SHIFT = 83, /* IDL_RIGHT_SHIFT */ + YYSYMBOL_IDL_WCHAR_LITERAL = 84, /* IDL_WCHAR_LITERAL */ + YYSYMBOL_IDL_WSTRING_LITERAL = 85, /* IDL_WSTRING_LITERAL */ + YYSYMBOL_IDL_ANNOTATION_DECL = 86, /* IDL_ANNOTATION_DECL */ + YYSYMBOL_IDL_ANNOTATION_SYMBOL = 87, /* IDL_ANNOTATION_SYMBOL */ + YYSYMBOL_88_ = 88, /* ';' */ + YYSYMBOL_89_ = 89, /* '{' */ + YYSYMBOL_90_ = 90, /* '}' */ + YYSYMBOL_91_ = 91, /* '<' */ + YYSYMBOL_92_ = 92, /* '>' */ + YYSYMBOL_93_ = 93, /* ':' */ + YYSYMBOL_94_ = 94, /* ',' */ + YYSYMBOL_95_ = 95, /* '=' */ + YYSYMBOL_96_ = 96, /* '|' */ + YYSYMBOL_97_ = 97, /* '^' */ + YYSYMBOL_98_ = 98, /* '&' */ + YYSYMBOL_99_ = 99, /* '+' */ + YYSYMBOL_100_ = 100, /* '-' */ + YYSYMBOL_101_ = 101, /* '*' */ + YYSYMBOL_102_ = 102, /* '/' */ + YYSYMBOL_103_ = 103, /* '%' */ + YYSYMBOL_104_ = 104, /* '~' */ + YYSYMBOL_105_ = 105, /* '(' */ + YYSYMBOL_106_ = 106, /* ')' */ + YYSYMBOL_107_ = 107, /* '[' */ + YYSYMBOL_108_ = 108, /* ']' */ + YYSYMBOL_YYACCEPT = 109, /* $accept */ + YYSYMBOL_start = 110, /* start */ + YYSYMBOL_definitions = 111, /* definitions */ + YYSYMBOL_at_least_one_definition = 112, /* at_least_one_definition */ + YYSYMBOL_definition = 113, /* definition */ + YYSYMBOL_fixed_definition = 114, /* fixed_definition */ + YYSYMBOL_115_1 = 115, /* $@1 */ + YYSYMBOL_116_2 = 116, /* $@2 */ + YYSYMBOL_117_3 = 117, /* $@3 */ + YYSYMBOL_118_4 = 118, /* $@4 */ + YYSYMBOL_119_5 = 119, /* $@5 */ + YYSYMBOL_120_6 = 120, /* $@6 */ + YYSYMBOL_121_7 = 121, /* $@7 */ + YYSYMBOL_122_8 = 122, /* $@8 */ + YYSYMBOL_123_9 = 123, /* $@9 */ + YYSYMBOL_124_10 = 124, /* $@10 */ + YYSYMBOL_125_11 = 125, /* $@11 */ + YYSYMBOL_126_12 = 126, /* $@12 */ + YYSYMBOL_127_13 = 127, /* $@13 */ + YYSYMBOL_128_14 = 128, /* $@14 */ + YYSYMBOL_129_15 = 129, /* $@15 */ + YYSYMBOL_module_header = 130, /* module_header */ + YYSYMBOL_131_16 = 131, /* $@16 */ + YYSYMBOL_module = 132, /* module */ + YYSYMBOL_133_17 = 133, /* @17 */ + YYSYMBOL_134_18 = 134, /* $@18 */ + YYSYMBOL_135_19 = 135, /* $@19 */ + YYSYMBOL_template_module_header = 136, /* template_module_header */ + YYSYMBOL_template_module = 137, /* template_module */ + YYSYMBOL_138_20 = 138, /* $@20 */ + YYSYMBOL_139_21 = 139, /* $@21 */ + YYSYMBOL_140_22 = 140, /* $@22 */ + YYSYMBOL_141_23 = 141, /* $@23 */ + YYSYMBOL_142_24 = 142, /* $@24 */ + YYSYMBOL_at_least_one_tpl_definition = 143, /* at_least_one_tpl_definition */ + YYSYMBOL_tpl_definitions = 144, /* tpl_definitions */ + YYSYMBOL_tpl_definition = 145, /* tpl_definition */ + YYSYMBOL_template_module_ref = 146, /* template_module_ref */ + YYSYMBOL_147_25 = 147, /* $@25 */ + YYSYMBOL_148_26 = 148, /* $@26 */ + YYSYMBOL_template_module_inst = 149, /* template_module_inst */ + YYSYMBOL_150_27 = 150, /* $@27 */ + YYSYMBOL_151_28 = 151, /* $@28 */ + YYSYMBOL_interface_def = 152, /* interface_def */ + YYSYMBOL_interface = 153, /* interface */ + YYSYMBOL_154_29 = 154, /* $@29 */ + YYSYMBOL_155_30 = 155, /* $@30 */ + YYSYMBOL_156_31 = 156, /* $@31 */ + YYSYMBOL_interface_decl = 157, /* interface_decl */ + YYSYMBOL_158_32 = 158, /* $@32 */ + YYSYMBOL_interface_header = 159, /* interface_header */ + YYSYMBOL_inheritance_spec = 160, /* inheritance_spec */ + YYSYMBOL_161_33 = 161, /* $@33 */ + YYSYMBOL_value_def = 162, /* value_def */ + YYSYMBOL_valuetype = 163, /* valuetype */ + YYSYMBOL_value_concrete_decl = 164, /* value_concrete_decl */ + YYSYMBOL_165_34 = 165, /* @34 */ + YYSYMBOL_166_35 = 166, /* $@35 */ + YYSYMBOL_167_36 = 167, /* $@36 */ + YYSYMBOL_value_abs_decl = 168, /* value_abs_decl */ + YYSYMBOL_169_37 = 169, /* $@37 */ + YYSYMBOL_170_38 = 170, /* $@38 */ + YYSYMBOL_171_39 = 171, /* $@39 */ + YYSYMBOL_value_header = 172, /* value_header */ + YYSYMBOL_173_40 = 173, /* $@40 */ + YYSYMBOL_value_decl = 174, /* value_decl */ + YYSYMBOL_175_41 = 175, /* $@41 */ + YYSYMBOL_opt_truncatable = 176, /* opt_truncatable */ + YYSYMBOL_supports_spec = 177, /* supports_spec */ + YYSYMBOL_value_forward_decl = 178, /* value_forward_decl */ + YYSYMBOL_value_box_decl = 179, /* value_box_decl */ + YYSYMBOL_value_elements = 180, /* value_elements */ + YYSYMBOL_value_element = 181, /* value_element */ + YYSYMBOL_182_42 = 182, /* @42 */ + YYSYMBOL_visibility = 183, /* visibility */ + YYSYMBOL_state_member = 184, /* state_member */ + YYSYMBOL_exports = 185, /* exports */ + YYSYMBOL_at_least_one_export = 186, /* at_least_one_export */ + YYSYMBOL_export = 187, /* export */ + YYSYMBOL_188_43 = 188, /* $@43 */ + YYSYMBOL_189_44 = 189, /* $@44 */ + YYSYMBOL_190_45 = 190, /* $@45 */ + YYSYMBOL_191_46 = 191, /* $@46 */ + YYSYMBOL_192_47 = 192, /* $@47 */ + YYSYMBOL_193_48 = 193, /* $@48 */ + YYSYMBOL_194_49 = 194, /* $@49 */ + YYSYMBOL_195_50 = 195, /* $@50 */ + YYSYMBOL_at_least_one_scoped_name = 196, /* at_least_one_scoped_name */ + YYSYMBOL_scoped_names = 197, /* scoped_names */ + YYSYMBOL_198_51 = 198, /* $@51 */ + YYSYMBOL_scoped_name = 199, /* scoped_name */ + YYSYMBOL_200_52 = 200, /* $@52 */ + YYSYMBOL_201_53 = 201, /* $@53 */ + YYSYMBOL_id = 202, /* id */ + YYSYMBOL_defining_id = 203, /* defining_id */ + YYSYMBOL_interface_forward = 204, /* interface_forward */ + YYSYMBOL_const_dcl = 205, /* const_dcl */ + YYSYMBOL_206_54 = 206, /* $@54 */ + YYSYMBOL_207_55 = 207, /* $@55 */ + YYSYMBOL_208_56 = 208, /* $@56 */ + YYSYMBOL_209_57 = 209, /* $@57 */ + YYSYMBOL_const_type = 210, /* const_type */ + YYSYMBOL_expression = 211, /* expression */ + YYSYMBOL_const_expr = 212, /* const_expr */ + YYSYMBOL_or_expr = 213, /* or_expr */ + YYSYMBOL_xor_expr = 214, /* xor_expr */ + YYSYMBOL_and_expr = 215, /* and_expr */ + YYSYMBOL_shift_expr = 216, /* shift_expr */ + YYSYMBOL_add_expr = 217, /* add_expr */ + YYSYMBOL_mult_expr = 218, /* mult_expr */ + YYSYMBOL_unary_expr = 219, /* unary_expr */ + YYSYMBOL_primary_expr = 220, /* primary_expr */ + YYSYMBOL_literal = 221, /* literal */ + YYSYMBOL_positive_int_expr = 222, /* positive_int_expr */ + YYSYMBOL_annotation_dcl = 223, /* annotation_dcl */ + YYSYMBOL_224_58 = 224, /* $@58 */ + YYSYMBOL_annotation_body = 225, /* annotation_body */ + YYSYMBOL_annotation_statement = 226, /* annotation_statement */ + YYSYMBOL_227_59 = 227, /* $@59 */ + YYSYMBOL_annotation_member_type = 228, /* annotation_member_type */ + YYSYMBOL_annotation_member = 229, /* annotation_member */ + YYSYMBOL_annotation_member_default = 230, /* annotation_member_default */ + YYSYMBOL_at_least_one_annotation = 231, /* at_least_one_annotation */ + YYSYMBOL_annotations_maybe = 232, /* annotations_maybe */ + YYSYMBOL_annotation_appl = 233, /* annotation_appl */ + YYSYMBOL_234_60 = 234, /* @60 */ + YYSYMBOL_annotation_appl_params_maybe = 235, /* annotation_appl_params_maybe */ + YYSYMBOL_annotation_appl_params = 236, /* annotation_appl_params */ + YYSYMBOL_named_annotation_appl_params = 237, /* named_annotation_appl_params */ + YYSYMBOL_more_named_annotation_appl_params = 238, /* more_named_annotation_appl_params */ + YYSYMBOL_named_annotation_appl_param = 239, /* named_annotation_appl_param */ + YYSYMBOL_type_dcl = 240, /* type_dcl */ + YYSYMBOL_241_61 = 241, /* $@61 */ + YYSYMBOL_type_declarator = 242, /* type_declarator */ + YYSYMBOL_243_62 = 243, /* $@62 */ + YYSYMBOL_type_spec = 244, /* type_spec */ + YYSYMBOL_simple_type_spec = 245, /* simple_type_spec */ + YYSYMBOL_base_type_spec = 246, /* base_type_spec */ + YYSYMBOL_template_type_spec = 247, /* template_type_spec */ + YYSYMBOL_constructed_type_spec = 248, /* constructed_type_spec */ + YYSYMBOL_constructed_forward_type_spec = 249, /* constructed_forward_type_spec */ + YYSYMBOL_at_least_one_declarator = 250, /* at_least_one_declarator */ + YYSYMBOL_declarators = 251, /* declarators */ + YYSYMBOL_252_63 = 252, /* $@63 */ + YYSYMBOL_declarator = 253, /* declarator */ + YYSYMBOL_at_least_one_simple_declarator = 254, /* at_least_one_simple_declarator */ + YYSYMBOL_simple_declarators = 255, /* simple_declarators */ + YYSYMBOL_256_64 = 256, /* $@64 */ + YYSYMBOL_simple_declarator = 257, /* simple_declarator */ + YYSYMBOL_complex_declarator = 258, /* complex_declarator */ + YYSYMBOL_integer_type = 259, /* integer_type */ + YYSYMBOL_signed_int = 260, /* signed_int */ + YYSYMBOL_unsigned_int = 261, /* unsigned_int */ + YYSYMBOL_floating_pt_type = 262, /* floating_pt_type */ + YYSYMBOL_fixed_type = 263, /* fixed_type */ + YYSYMBOL_char_type = 264, /* char_type */ + YYSYMBOL_octet_type = 265, /* octet_type */ + YYSYMBOL_boolean_type = 266, /* boolean_type */ + YYSYMBOL_any_type = 267, /* any_type */ + YYSYMBOL_object_type = 268, /* object_type */ + YYSYMBOL_struct_decl = 269, /* struct_decl */ + YYSYMBOL_270_65 = 270, /* $@65 */ + YYSYMBOL_struct_type = 271, /* struct_type */ + YYSYMBOL_272_66 = 272, /* $@66 */ + YYSYMBOL_273_67 = 273, /* $@67 */ + YYSYMBOL_274_68 = 274, /* $@68 */ + YYSYMBOL_at_least_one_member = 275, /* at_least_one_member */ + YYSYMBOL_members = 276, /* members */ + YYSYMBOL_member = 277, /* member */ + YYSYMBOL_member_i = 278, /* member_i */ + YYSYMBOL_279_69 = 279, /* $@69 */ + YYSYMBOL_280_70 = 280, /* $@70 */ + YYSYMBOL_281_71 = 281, /* $@71 */ + YYSYMBOL_union_decl = 282, /* union_decl */ + YYSYMBOL_283_72 = 283, /* $@72 */ + YYSYMBOL_union_type = 284, /* union_type */ + YYSYMBOL_285_73 = 285, /* $@73 */ + YYSYMBOL_286_74 = 286, /* $@74 */ + YYSYMBOL_287_75 = 287, /* $@75 */ + YYSYMBOL_288_76 = 288, /* $@76 */ + YYSYMBOL_289_77 = 289, /* $@77 */ + YYSYMBOL_290_78 = 290, /* $@78 */ + YYSYMBOL_switch_type_spec = 291, /* switch_type_spec */ + YYSYMBOL_at_least_one_case_branch = 292, /* at_least_one_case_branch */ + YYSYMBOL_case_branches = 293, /* case_branches */ + YYSYMBOL_case_branch = 294, /* case_branch */ + YYSYMBOL_295_79 = 295, /* $@79 */ + YYSYMBOL_296_80 = 296, /* $@80 */ + YYSYMBOL_297_81 = 297, /* $@81 */ + YYSYMBOL_at_least_one_case_label = 298, /* at_least_one_case_label */ + YYSYMBOL_case_labels = 299, /* case_labels */ + YYSYMBOL_case_label = 300, /* case_label */ + YYSYMBOL_301_82 = 301, /* $@82 */ + YYSYMBOL_302_83 = 302, /* $@83 */ + YYSYMBOL_303_84 = 303, /* $@84 */ + YYSYMBOL_element_spec = 304, /* element_spec */ + YYSYMBOL_305_85 = 305, /* $@85 */ + YYSYMBOL_struct_forward_type = 306, /* struct_forward_type */ + YYSYMBOL_union_forward_type = 307, /* union_forward_type */ + YYSYMBOL_enum_type = 308, /* enum_type */ + YYSYMBOL_309_86 = 309, /* $@86 */ + YYSYMBOL_310_87 = 310, /* $@87 */ + YYSYMBOL_311_88 = 311, /* $@88 */ + YYSYMBOL_312_89 = 312, /* $@89 */ + YYSYMBOL_at_least_one_enumerator = 313, /* at_least_one_enumerator */ + YYSYMBOL_enumerators = 314, /* enumerators */ + YYSYMBOL_315_90 = 315, /* $@90 */ + YYSYMBOL_enumerator = 316, /* enumerator */ + YYSYMBOL_sequence_type_spec = 317, /* sequence_type_spec */ + YYSYMBOL_318_91 = 318, /* $@91 */ + YYSYMBOL_319_92 = 319, /* $@92 */ + YYSYMBOL_seq_head = 320, /* seq_head */ + YYSYMBOL_321_93 = 321, /* $@93 */ + YYSYMBOL_322_94 = 322, /* $@94 */ + YYSYMBOL_fixed_type_spec = 323, /* fixed_type_spec */ + YYSYMBOL_string_type_spec = 324, /* string_type_spec */ + YYSYMBOL_325_95 = 325, /* $@95 */ + YYSYMBOL_326_96 = 326, /* $@96 */ + YYSYMBOL_string_head = 327, /* string_head */ + YYSYMBOL_wstring_type_spec = 328, /* wstring_type_spec */ + YYSYMBOL_329_97 = 329, /* $@97 */ + YYSYMBOL_330_98 = 330, /* $@98 */ + YYSYMBOL_wstring_head = 331, /* wstring_head */ + YYSYMBOL_array_declarator = 332, /* array_declarator */ + YYSYMBOL_333_99 = 333, /* $@99 */ + YYSYMBOL_at_least_one_array_dim = 334, /* at_least_one_array_dim */ + YYSYMBOL_array_dims = 335, /* array_dims */ + YYSYMBOL_array_dim = 336, /* array_dim */ + YYSYMBOL_337_100 = 337, /* $@100 */ + YYSYMBOL_338_101 = 338, /* $@101 */ + YYSYMBOL_attribute = 339, /* attribute */ + YYSYMBOL_attribute_readonly = 340, /* attribute_readonly */ + YYSYMBOL_341_102 = 341, /* $@102 */ + YYSYMBOL_342_103 = 342, /* $@103 */ + YYSYMBOL_343_104 = 343, /* $@104 */ + YYSYMBOL_344_105 = 344, /* $@105 */ + YYSYMBOL_attribute_readwrite = 345, /* attribute_readwrite */ + YYSYMBOL_346_106 = 346, /* $@106 */ + YYSYMBOL_347_107 = 347, /* $@107 */ + YYSYMBOL_348_108 = 348, /* $@108 */ + YYSYMBOL_349_109 = 349, /* $@109 */ + YYSYMBOL_exception = 350, /* exception */ + YYSYMBOL_351_110 = 351, /* $@110 */ + YYSYMBOL_352_111 = 352, /* @111 */ + YYSYMBOL_353_112 = 353, /* $@112 */ + YYSYMBOL_354_113 = 354, /* $@113 */ + YYSYMBOL_operation = 355, /* operation */ + YYSYMBOL_356_114 = 356, /* $@114 */ + YYSYMBOL_357_115 = 357, /* $@115 */ + YYSYMBOL_358_116 = 358, /* $@116 */ + YYSYMBOL_359_117 = 359, /* $@117 */ + YYSYMBOL_opt_op_attribute = 360, /* opt_op_attribute */ + YYSYMBOL_op_type_spec = 361, /* op_type_spec */ + YYSYMBOL_init_decl = 362, /* init_decl */ + YYSYMBOL_363_118 = 363, /* $@118 */ + YYSYMBOL_364_119 = 364, /* @119 */ + YYSYMBOL_365_120 = 365, /* $@120 */ + YYSYMBOL_init_parameter_list = 366, /* init_parameter_list */ + YYSYMBOL_367_121 = 367, /* $@121 */ + YYSYMBOL_368_122 = 368, /* $@122 */ + YYSYMBOL_at_least_one_in_parameter = 369, /* at_least_one_in_parameter */ + YYSYMBOL_in_parameters = 370, /* in_parameters */ + YYSYMBOL_371_123 = 371, /* $@123 */ + YYSYMBOL_in_parameter = 372, /* in_parameter */ + YYSYMBOL_373_124 = 373, /* $@124 */ + YYSYMBOL_374_125 = 374, /* $@125 */ + YYSYMBOL_parameter_list = 375, /* parameter_list */ + YYSYMBOL_376_126 = 376, /* $@126 */ + YYSYMBOL_377_127 = 377, /* $@127 */ + YYSYMBOL_at_least_one_parameter = 378, /* at_least_one_parameter */ + YYSYMBOL_parameters = 379, /* parameters */ + YYSYMBOL_380_128 = 380, /* $@128 */ + YYSYMBOL_parameter = 381, /* parameter */ + YYSYMBOL_382_129 = 382, /* $@129 */ + YYSYMBOL_383_130 = 383, /* $@130 */ + YYSYMBOL_param_type_spec = 384, /* param_type_spec */ + YYSYMBOL_direction = 385, /* direction */ + YYSYMBOL_opt_raises = 386, /* opt_raises */ + YYSYMBOL_387_131 = 387, /* $@131 */ + YYSYMBOL_388_132 = 388, /* $@132 */ + YYSYMBOL_opt_getraises = 389, /* opt_getraises */ + YYSYMBOL_390_133 = 390, /* $@133 */ + YYSYMBOL_391_134 = 391, /* $@134 */ + YYSYMBOL_opt_setraises = 392, /* opt_setraises */ + YYSYMBOL_393_135 = 393, /* $@135 */ + YYSYMBOL_394_136 = 394, /* $@136 */ + YYSYMBOL_opt_context = 395, /* opt_context */ + YYSYMBOL_396_137 = 396, /* $@137 */ + YYSYMBOL_397_138 = 397, /* $@138 */ + YYSYMBOL_at_least_one_string_literal = 398, /* at_least_one_string_literal */ + YYSYMBOL_string_literals = 399, /* string_literals */ + YYSYMBOL_400_139 = 400, /* $@139 */ + YYSYMBOL_typeid_dcl = 401, /* typeid_dcl */ + YYSYMBOL_typeprefix_dcl = 402, /* typeprefix_dcl */ + YYSYMBOL_component = 403, /* component */ + YYSYMBOL_component_forward_decl = 404, /* component_forward_decl */ + YYSYMBOL_component_decl = 405, /* component_decl */ + YYSYMBOL_406_140 = 406, /* @140 */ + YYSYMBOL_407_141 = 407, /* $@141 */ + YYSYMBOL_408_142 = 408, /* $@142 */ + YYSYMBOL_component_header = 409, /* component_header */ + YYSYMBOL_410_143 = 410, /* $@143 */ + YYSYMBOL_411_144 = 411, /* $@144 */ + YYSYMBOL_component_inheritance_spec = 412, /* component_inheritance_spec */ + YYSYMBOL_413_145 = 413, /* $@145 */ + YYSYMBOL_component_exports = 414, /* component_exports */ + YYSYMBOL_component_export = 415, /* component_export */ + YYSYMBOL_416_146 = 416, /* $@146 */ + YYSYMBOL_417_147 = 417, /* $@147 */ + YYSYMBOL_418_148 = 418, /* $@148 */ + YYSYMBOL_419_149 = 419, /* $@149 */ + YYSYMBOL_420_150 = 420, /* $@150 */ + YYSYMBOL_421_151 = 421, /* $@151 */ + YYSYMBOL_422_152 = 422, /* $@152 */ + YYSYMBOL_provides_decl = 423, /* provides_decl */ + YYSYMBOL_interface_type = 424, /* interface_type */ + YYSYMBOL_uses_decl = 425, /* uses_decl */ + YYSYMBOL_uses_opt_multiple = 426, /* uses_opt_multiple */ + YYSYMBOL_opt_multiple = 427, /* opt_multiple */ + YYSYMBOL_emits_decl = 428, /* emits_decl */ + YYSYMBOL_publishes_decl = 429, /* publishes_decl */ + YYSYMBOL_consumes_decl = 430, /* consumes_decl */ + YYSYMBOL_home_decl = 431, /* home_decl */ + YYSYMBOL_432_153 = 432, /* $@153 */ + YYSYMBOL_home_header = 433, /* home_header */ + YYSYMBOL_434_154 = 434, /* $@154 */ + YYSYMBOL_435_155 = 435, /* $@155 */ + YYSYMBOL_436_156 = 436, /* $@156 */ + YYSYMBOL_437_157 = 437, /* $@157 */ + YYSYMBOL_438_158 = 438, /* $@158 */ + YYSYMBOL_439_159 = 439, /* $@159 */ + YYSYMBOL_home_inheritance_spec = 440, /* home_inheritance_spec */ + YYSYMBOL_441_160 = 441, /* $@160 */ + YYSYMBOL_primary_key_spec = 442, /* primary_key_spec */ + YYSYMBOL_home_body = 443, /* home_body */ + YYSYMBOL_444_161 = 444, /* $@161 */ + YYSYMBOL_445_162 = 445, /* $@162 */ + YYSYMBOL_home_exports = 446, /* home_exports */ + YYSYMBOL_home_export = 447, /* home_export */ + YYSYMBOL_448_163 = 448, /* $@163 */ + YYSYMBOL_449_164 = 449, /* $@164 */ + YYSYMBOL_factory_decl = 450, /* factory_decl */ + YYSYMBOL_451_165 = 451, /* $@165 */ + YYSYMBOL_452_166 = 452, /* $@166 */ + YYSYMBOL_finder_decl = 453, /* finder_decl */ + YYSYMBOL_454_167 = 454, /* $@167 */ + YYSYMBOL_455_168 = 455, /* $@168 */ + YYSYMBOL_event = 456, /* event */ + YYSYMBOL_event_forward_decl = 457, /* event_forward_decl */ + YYSYMBOL_event_concrete_forward_decl = 458, /* event_concrete_forward_decl */ + YYSYMBOL_event_abs_forward_decl = 459, /* event_abs_forward_decl */ + YYSYMBOL_event_abs_decl = 460, /* event_abs_decl */ + YYSYMBOL_461_169 = 461, /* $@169 */ + YYSYMBOL_462_170 = 462, /* $@170 */ + YYSYMBOL_463_171 = 463, /* $@171 */ + YYSYMBOL_event_abs_header = 464, /* event_abs_header */ + YYSYMBOL_event_custom_header = 465, /* event_custom_header */ + YYSYMBOL_event_plain_header = 466, /* event_plain_header */ + YYSYMBOL_event_rest_of_header = 467, /* event_rest_of_header */ + YYSYMBOL_468_172 = 468, /* $@172 */ + YYSYMBOL_event_decl = 469, /* event_decl */ + YYSYMBOL_470_173 = 470, /* @173 */ + YYSYMBOL_471_174 = 471, /* $@174 */ + YYSYMBOL_472_175 = 472, /* $@175 */ + YYSYMBOL_event_header = 473, /* event_header */ + YYSYMBOL_formal_parameter_type = 474, /* formal_parameter_type */ + YYSYMBOL_at_least_one_formal_parameter = 475, /* at_least_one_formal_parameter */ + YYSYMBOL_formal_parameters = 476, /* formal_parameters */ + YYSYMBOL_formal_parameter = 477, /* formal_parameter */ + YYSYMBOL_at_least_one_formal_parameter_name = 478, /* at_least_one_formal_parameter_name */ + YYSYMBOL_formal_parameter_names = 479, /* formal_parameter_names */ + YYSYMBOL_formal_parameter_name = 480, /* formal_parameter_name */ + YYSYMBOL_porttype_decl = 481, /* porttype_decl */ + YYSYMBOL_482_176 = 482, /* $@176 */ + YYSYMBOL_483_177 = 483, /* @177 */ + YYSYMBOL_484_178 = 484, /* $@178 */ + YYSYMBOL_485_179 = 485, /* $@179 */ + YYSYMBOL_at_least_one_port_export = 486, /* at_least_one_port_export */ + YYSYMBOL_port_exports = 487, /* port_exports */ + YYSYMBOL_port_export = 488, /* port_export */ + YYSYMBOL_489_180 = 489, /* $@180 */ + YYSYMBOL_extended_port_decl = 490, /* extended_port_decl */ + YYSYMBOL_at_least_one_actual_parameter = 491, /* at_least_one_actual_parameter */ + YYSYMBOL_actual_parameters = 492, /* actual_parameters */ + YYSYMBOL_actual_parameter = 493, /* actual_parameter */ + YYSYMBOL_connector_decl = 494, /* connector_decl */ + YYSYMBOL_connector_header = 495, /* connector_header */ + YYSYMBOL_496_181 = 496, /* $@181 */ + YYSYMBOL_497_182 = 497, /* $@182 */ + YYSYMBOL_connector_body = 498, /* connector_body */ + YYSYMBOL_499_183 = 499, /* $@183 */ + YYSYMBOL_500_184 = 500, /* $@184 */ + YYSYMBOL_connector_exports = 501, /* connector_exports */ + YYSYMBOL_connector_export = 502, /* connector_export */ + YYSYMBOL_503_185 = 503, /* $@185 */ + YYSYMBOL_504_186 = 504, /* $@186 */ + YYSYMBOL_505_187 = 505, /* $@187 */ + YYSYMBOL_506_188 = 506 /* $@188 */ +}; +typedef enum yysymbol_kind_t yysymbol_kind_t; + @@ -357,28 +878,75 @@ int tao_yyparse (void); # undef short #endif -#ifdef YYTYPE_UINT8 -typedef YYTYPE_UINT8 yytype_uint8; -#else -typedef unsigned char yytype_uint8; +/* On compilers that do not define __PTRDIFF_MAX__ etc., make sure + <limits.h> and (if available) <stdint.h> are included + so that the code can choose integer types of a good width. */ + +#ifndef __PTRDIFF_MAX__ +# include <limits.h> /* INFRINGES ON USER NAME SPACE */ +# if defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__ +# include <stdint.h> /* INFRINGES ON USER NAME SPACE */ +# define YY_STDINT_H +# endif #endif -#ifdef YYTYPE_INT8 -typedef YYTYPE_INT8 yytype_int8; +/* Narrow types that promote to a signed type and that can represent a + signed or unsigned integer of at least N bits. In tables they can + save space and decrease cache pressure. Promoting to a signed type + helps avoid bugs in integer arithmetic. */ + +#ifdef __INT_LEAST8_MAX__ +typedef __INT_LEAST8_TYPE__ yytype_int8; +#elif defined YY_STDINT_H +typedef int_least8_t yytype_int8; #else typedef signed char yytype_int8; #endif -#ifdef YYTYPE_UINT16 -typedef YYTYPE_UINT16 yytype_uint16; +#ifdef __INT_LEAST16_MAX__ +typedef __INT_LEAST16_TYPE__ yytype_int16; +#elif defined YY_STDINT_H +typedef int_least16_t yytype_int16; #else -typedef unsigned short yytype_uint16; +typedef short yytype_int16; #endif -#ifdef YYTYPE_INT16 -typedef YYTYPE_INT16 yytype_int16; +#if defined __UINT_LEAST8_MAX__ && __UINT_LEAST8_MAX__ <= __INT_MAX__ +typedef __UINT_LEAST8_TYPE__ yytype_uint8; +#elif (!defined __UINT_LEAST8_MAX__ && defined YY_STDINT_H \ + && UINT_LEAST8_MAX <= INT_MAX) +typedef uint_least8_t yytype_uint8; +#elif !defined __UINT_LEAST8_MAX__ && UCHAR_MAX <= INT_MAX +typedef unsigned char yytype_uint8; #else -typedef short yytype_int16; +typedef short yytype_uint8; +#endif + +#if defined __UINT_LEAST16_MAX__ && __UINT_LEAST16_MAX__ <= __INT_MAX__ +typedef __UINT_LEAST16_TYPE__ yytype_uint16; +#elif (!defined __UINT_LEAST16_MAX__ && defined YY_STDINT_H \ + && UINT_LEAST16_MAX <= INT_MAX) +typedef uint_least16_t yytype_uint16; +#elif !defined __UINT_LEAST16_MAX__ && USHRT_MAX <= INT_MAX +typedef unsigned short yytype_uint16; +#else +typedef int yytype_uint16; +#endif + +#ifndef YYPTRDIFF_T +# if defined __PTRDIFF_TYPE__ && defined __PTRDIFF_MAX__ +# define YYPTRDIFF_T __PTRDIFF_TYPE__ +# define YYPTRDIFF_MAXIMUM __PTRDIFF_MAX__ +# elif defined PTRDIFF_MAX +# ifndef ptrdiff_t +# include <stddef.h> /* INFRINGES ON USER NAME SPACE */ +# endif +# define YYPTRDIFF_T ptrdiff_t +# define YYPTRDIFF_MAXIMUM PTRDIFF_MAX +# else +# define YYPTRDIFF_T long +# define YYPTRDIFF_MAXIMUM LONG_MAX +# endif #endif #ifndef YYSIZE_T @@ -386,7 +954,7 @@ typedef short yytype_int16; # define YYSIZE_T __SIZE_TYPE__ # elif defined size_t # define YYSIZE_T size_t -# elif ! defined YYSIZE_T +# elif defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__ # include <stddef.h> /* INFRINGES ON USER NAME SPACE */ # define YYSIZE_T size_t # else @@ -394,7 +962,20 @@ typedef short yytype_int16; # endif #endif -#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) +#define YYSIZE_MAXIMUM \ + YY_CAST (YYPTRDIFF_T, \ + (YYPTRDIFF_MAXIMUM < YY_CAST (YYSIZE_T, -1) \ + ? YYPTRDIFF_MAXIMUM \ + : YY_CAST (YYSIZE_T, -1))) + +#define YYSIZEOF(X) YY_CAST (YYPTRDIFF_T, sizeof (X)) + + +/* Stored state numbers (used for stacks). */ +typedef yytype_int16 yy_state_t; + +/* State numbers in computations. */ +typedef int yy_state_fast_t; #ifndef YY_ # if defined YYENABLE_NLS && YYENABLE_NLS @@ -408,22 +989,21 @@ typedef short yytype_int16; # endif #endif -#ifndef YY_ATTRIBUTE -# if (defined __GNUC__ \ - && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__))) \ - || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C -# define YY_ATTRIBUTE(Spec) __attribute__(Spec) -# else -# define YY_ATTRIBUTE(Spec) /* empty */ -# endif -#endif #ifndef YY_ATTRIBUTE_PURE -# define YY_ATTRIBUTE_PURE YY_ATTRIBUTE ((__pure__)) +# if defined __GNUC__ && 2 < __GNUC__ + (96 <= __GNUC_MINOR__) +# define YY_ATTRIBUTE_PURE __attribute__ ((__pure__)) +# else +# define YY_ATTRIBUTE_PURE +# endif #endif #ifndef YY_ATTRIBUTE_UNUSED -# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__)) +# if defined __GNUC__ && 2 < __GNUC__ + (7 <= __GNUC_MINOR__) +# define YY_ATTRIBUTE_UNUSED __attribute__ ((__unused__)) +# else +# define YY_ATTRIBUTE_UNUSED +# endif #endif /* Suppress unused-variable warnings by "using" E. */ @@ -435,11 +1015,11 @@ typedef short yytype_int16; #if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ /* Suppress an incorrect diagnostic about yylval being uninitialized. */ -# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ - _Pragma ("GCC diagnostic push") \ - _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\ +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"") \ _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") -# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ +# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ _Pragma ("GCC diagnostic pop") #else # define YY_INITIAL_VALUE(Value) Value @@ -452,10 +1032,22 @@ typedef short yytype_int16; # define YY_INITIAL_VALUE(Value) /* Nothing. */ #endif +#if defined __cplusplus && defined __GNUC__ && ! defined __ICC && 6 <= __GNUC__ +# define YY_IGNORE_USELESS_CAST_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuseless-cast\"") +# define YY_IGNORE_USELESS_CAST_END \ + _Pragma ("GCC diagnostic pop") +#endif +#ifndef YY_IGNORE_USELESS_CAST_BEGIN +# define YY_IGNORE_USELESS_CAST_BEGIN +# define YY_IGNORE_USELESS_CAST_END +#endif + #define YY_ASSERT(E) ((void) (0 && (E))) -#if ! defined yyoverflow || YYERROR_VERBOSE +#if !defined yyoverflow /* The parser invokes alloca or malloc; define the necessary symbols. */ @@ -520,8 +1112,7 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif # endif # endif -#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ - +#endif /* !defined yyoverflow */ #if (! defined yyoverflow \ && (! defined __cplusplus \ @@ -530,17 +1121,17 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ /* A type that is properly aligned for any stack member. */ union yyalloc { - yytype_int16 yyss_alloc; + yy_state_t yyss_alloc; YYSTYPE yyvs_alloc; }; /* The size of the maximum gap between one aligned stack and the next. */ -# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) +# define YYSTACK_GAP_MAXIMUM (YYSIZEOF (union yyalloc) - 1) /* The size of an array large to enough to hold all stacks, each with N elements. */ # define YYSTACK_BYTES(N) \ - ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ + ((N) * (YYSIZEOF (yy_state_t) + YYSIZEOF (YYSTYPE)) \ + YYSTACK_GAP_MAXIMUM) # define YYCOPY_NEEDED 1 @@ -553,11 +1144,11 @@ union yyalloc # define YYSTACK_RELOCATE(Stack_alloc, Stack) \ do \ { \ - YYSIZE_T yynewbytes; \ + YYPTRDIFF_T yynewbytes; \ YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ Stack = &yyptr->Stack_alloc; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ - yyptr += yynewbytes / sizeof (*yyptr); \ + yynewbytes = yystacksize * YYSIZEOF (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / YYSIZEOF (*yyptr); \ } \ while (0) @@ -569,12 +1160,12 @@ union yyalloc # ifndef YYCOPY # if defined __GNUC__ && 1 < __GNUC__ # define YYCOPY(Dst, Src, Count) \ - __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src))) + __builtin_memcpy (Dst, Src, YY_CAST (YYSIZE_T, (Count)) * sizeof (*(Src))) # else # define YYCOPY(Dst, Src, Count) \ do \ { \ - YYSIZE_T yyi; \ + YYPTRDIFF_T yyi; \ for (yyi = 0; yyi < (Count); yyi++) \ (Dst)[yyi] = (Src)[yyi]; \ } \ @@ -586,28 +1177,30 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 4 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1567 +#define YYLAST 1637 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 109 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 399 +#define YYNNTS 398 /* YYNRULES -- Number of rules. */ -#define YYNRULES 597 +#define YYNRULES 599 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 878 +#define YYNSTATES 880 -#define YYUNDEFTOK 2 #define YYMAXUTOK 342 + /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM as returned by yylex, with out-of-bounds checking. */ -#define YYTRANSLATE(YYX) \ - ((unsigned) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) +#define YYTRANSLATE(YYX) \ + (0 <= (YYX) && (YYX) <= YYMAXUTOK \ + ? YY_CAST (yysymbol_kind_t, yytranslate[YYX]) \ + : YYSYMBOL_YYUNDEF) /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM as returned by yylex. */ -static const yytype_uint8 yytranslate[] = +static const yytype_int8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -647,87 +1240,94 @@ static const yytype_uint8 yytranslate[] = }; #if YYDEBUG - /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ -static const yytype_uint16 yyrline[] = + /* YYRLINEYYN -- Source line where rule number YYN was defined. */ +static const yytype_int16 yyrline[] = { - 0, 400, 400, 403, 404, 412, 427, 433, 434, 435, - 440, 439, 448, 447, 456, 455, 464, 463, 472, 471, - 480, 479, 488, 487, 496, 495, 504, 503, 512, 511, - 520, 519, 528, 527, 536, 535, 544, 543, 552, 551, - 565, 564, 576, 615, 619, 575, 635, 643, 657, 667, - 697, 701, 642, 726, 730, 731, 735, 736, 741, 746, - 740, 832, 837, 831, 908, 909, 914, 952, 956, 913, - 973, 972, 984, 1021, 1051, 1084, 1083, 1092, 1099, 1100, - 1101, 1102, 1106, 1111, 1116, 1159, 1163, 1115, 1192, 1235, - 1239, 1190, 1258, 1256, 1296, 1295, 1307, 1311, 1318, 1323, - 1330, 1355, 1383, 1449, 1450, 1454, 1455, 1456, 1461, 1465, - 1472, 1491, 1492, 1496, 1511, 1518, 1517, 1526, 1525, 1534, - 1533, 1542, 1541, 1550, 1549, 1558, 1557, 1566, 1565, 1574, - 1573, 1586, 1598, 1596, 1621, 1628, 1638, 1637, 1663, 1661, - 1686, 1696, 1707, 1751, 1778, 1810, 1814, 1818, 1822, 1809, - 1884, 1885, 1886, 1887, 1888, 1889, 1890, 1894, 1898, 1966, - 1968, 1970, 1971, 1983, 1984, 1996, 1997, 2009, 2010, 2019, - 2031, 2032, 2041, 2053, 2054, 2063, 2072, 2084, 2085, 2094, - 2103, 2115, 2172, 2173, 2180, 2184, 2189, 2196, 2203, 2207, - 2212, 2216, 2220, 2224, 2231, 2300, 2299, 2328, 2329, 2333, - 2334, 2335, 2337, 2336, 2345, 2346, 2350, 2406, 2410, 2417, - 2430, 2440, 2448, 2447, 2535, 2539, 2546, 2555, 2562, 2570, - 2576, 2583, 2596, 2595, 2604, 2608, 2612, 2616, 2644, 2652, - 2651, 2722, 2723, 2727, 2734, 2735, 2761, 2762, 2763, 2764, - 2765, 2766, 2767, 2768, 2772, 2773, 2774, 2775, 2779, 2780, - 2781, 2785, 2786, 2790, 2802, 2800, 2825, 2832, 2833, 2837, - 2849, 2847, 2872, 2879, 2895, 2913, 2914, 2918, 2922, 2926, - 2933, 2937, 2941, 2948, 2952, 2956, 2963, 2970, 2974, 2981, - 2988, 2995, 3002, 3010, 3009, 3023, 3054, 3058, 3022, 3075, - 3078, 3079, 3083, 3101, 3105, 3100, 3163, 3162, 3175, 3174, - 3187, 3191, 3224, 3228, 3287, 3291, 3186, 3313, 3320, 3333, - 3342, 3349, 3350, 3459, 3462, 3463, 3468, 3472, 3467, 3508, - 3507, 3519, 3529, 3547, 3555, 3554, 3568, 3572, 3567, 3588, - 3587, 3638, 3663, 3687, 3691, 3722, 3726, 3686, 3750, 3755, - 3753, 3759, 3763, 3803, 3807, 3801, 3895, 3966, 3975, 3965, - 3989, 3999, 4003, 3997, 4048, 4074, 4083, 4087, 4081, 4123, - 4149, 4157, 4156, 4203, 4213, 4231, 4239, 4243, 4238, 4303, - 4304, 4309, 4313, 4317, 4321, 4308, 4380, 4384, 4388, 4392, - 4379, 4460, 4464, 4493, 4497, 4459, 4514, 4518, 4579, 4583, - 4513, 4620, 4625, 4630, 4637, 4638, 4649, 4654, 4697, 4648, - 4717, 4716, 4725, 4724, 4735, 4740, 4738, 4744, 4749, 4753, - 4748, 4792, 4791, 4800, 4799, 4810, 4815, 4813, 4819, 4824, - 4828, 4823, 4873, 4880, 4881, 4882, 4989, 4993, 4997, 5005, - 5009, 5004, 5018, 5026, 5030, 5025, 5039, 5047, 5051, 5046, - 5060, 5068, 5072, 5067, 5081, 5088, 5100, 5098, 5121, 5128, - 5158, 5197, 5198, 5202, 5233, 5272, 5276, 5232, 5295, 5299, - 5293, 5340, 5339, 5347, 5354, 5355, 5360, 5359, 5368, 5367, - 5376, 5375, 5384, 5383, 5392, 5391, 5400, 5399, 5408, 5407, - 5417, 5507, 5513, 5538, 5644, 5653, 5657, 5663, 5735, 5807, - 5881, 5880, 5930, 5934, 5938, 5942, 5946, 5950, 5929, 6003, - 6002, 6010, 6017, 6022, 6030, 6034, 6029, 6044, 6045, 6049, - 6051, 6050, 6059, 6058, 6071, 6094, 6069, 6120, 6147, 6118, - 6171, 6172, 6173, 6177, 6178, 6182, 6211, 6243, 6287, 6291, - 6241, 6308, 6317, 6335, 6346, 6345, 6383, 6432, 6436, 6381, - 6453, 6457, 6464, 6468, 6472, 6476, 6480, 6484, 6488, 6492, - 6496, 6500, 6508, 6539, 6552, 6559, 6584, 6602, 6609, 6624, - 6631, 6641, 6645, 6665, 6669, 6640, 6684, 6690, 6693, 6700, - 6699, 6706, 6705, 6712, 6711, 6721, 6790, 6840, 6856, 6869, - 6876, 6935, 6943, 6947, 6942, 7008, 7012, 7007, 7025, 7026, - 7031, 7030, 7039, 7038, 7047, 7046, 7055, 7054 + 0, 404, 404, 407, 408, 416, 431, 435, 436, 437, + 442, 441, 450, 449, 458, 457, 466, 465, 474, 473, + 482, 481, 490, 489, 498, 497, 506, 505, 514, 513, + 522, 521, 530, 529, 538, 537, 546, 545, 554, 553, + 567, 566, 578, 617, 621, 577, 637, 645, 659, 669, + 699, 703, 644, 728, 732, 733, 737, 738, 743, 748, + 742, 834, 839, 833, 910, 911, 916, 954, 958, 915, + 975, 974, 986, 1023, 1053, 1086, 1085, 1094, 1101, 1102, + 1103, 1104, 1108, 1113, 1118, 1165, 1169, 1117, 1198, 1241, + 1245, 1196, 1264, 1262, 1302, 1301, 1313, 1317, 1324, 1329, + 1336, 1361, 1389, 1455, 1474, 1478, 1482, 1483, 1495, 1494, + 1512, 1516, 1523, 1544, 1545, 1549, 1564, 1569, 1568, 1577, + 1576, 1585, 1584, 1593, 1592, 1601, 1600, 1609, 1608, 1617, + 1616, 1625, 1624, 1637, 1649, 1647, 1672, 1679, 1689, 1688, + 1714, 1712, 1737, 1747, 1758, 1802, 1829, 1861, 1865, 1869, + 1873, 1860, 1935, 1936, 1937, 1938, 1939, 1940, 1941, 1945, + 1949, 2017, 2019, 2021, 2022, 2034, 2035, 2047, 2048, 2060, + 2061, 2070, 2082, 2083, 2092, 2104, 2105, 2114, 2123, 2135, + 2136, 2145, 2154, 2166, 2223, 2224, 2231, 2235, 2240, 2247, + 2254, 2258, 2263, 2267, 2271, 2275, 2282, 2351, 2350, 2379, + 2380, 2384, 2385, 2386, 2388, 2387, 2396, 2397, 2401, 2457, + 2461, 2468, 2481, 2491, 2499, 2498, 2586, 2590, 2597, 2606, + 2613, 2621, 2627, 2634, 2647, 2646, 2655, 2659, 2663, 2667, + 2695, 2703, 2702, 2773, 2774, 2778, 2785, 2786, 2812, 2813, + 2814, 2815, 2816, 2817, 2818, 2819, 2823, 2824, 2825, 2826, + 2830, 2831, 2832, 2836, 2837, 2841, 2853, 2851, 2876, 2883, + 2884, 2888, 2900, 2898, 2923, 2930, 2946, 2964, 2965, 2969, + 2973, 2977, 2984, 2988, 2992, 2999, 3003, 3007, 3014, 3021, + 3025, 3032, 3039, 3046, 3053, 3061, 3060, 3074, 3105, 3109, + 3073, 3126, 3129, 3130, 3134, 3152, 3156, 3151, 3214, 3213, + 3226, 3225, 3238, 3242, 3275, 3279, 3338, 3342, 3237, 3364, + 3371, 3384, 3393, 3400, 3401, 3510, 3513, 3514, 3519, 3523, + 3518, 3559, 3558, 3570, 3580, 3598, 3606, 3605, 3619, 3623, + 3618, 3639, 3638, 3688, 3713, 3737, 3741, 3772, 3776, 3736, + 3800, 3805, 3803, 3809, 3813, 3853, 3857, 3851, 3941, 4008, + 4017, 4007, 4031, 4041, 4045, 4039, 4087, 4113, 4122, 4126, + 4120, 4159, 4185, 4193, 4192, 4235, 4245, 4263, 4271, 4275, + 4270, 4335, 4336, 4341, 4345, 4349, 4353, 4340, 4412, 4416, + 4420, 4424, 4411, 4492, 4496, 4528, 4532, 4491, 4549, 4553, + 4614, 4618, 4548, 4655, 4660, 4665, 4672, 4673, 4684, 4689, + 4732, 4683, 4754, 4753, 4762, 4761, 4772, 4777, 4775, 4781, + 4786, 4790, 4785, 4829, 4828, 4837, 4836, 4847, 4852, 4850, + 4856, 4861, 4865, 4860, 4910, 4917, 4918, 4919, 5026, 5030, + 5034, 5042, 5046, 5041, 5055, 5063, 5067, 5062, 5076, 5084, + 5088, 5083, 5097, 5105, 5109, 5104, 5118, 5125, 5137, 5135, + 5158, 5165, 5195, 5234, 5235, 5239, 5270, 5312, 5316, 5269, + 5335, 5339, 5333, 5380, 5379, 5387, 5394, 5409, 5410, 5415, + 5414, 5424, 5423, 5433, 5432, 5442, 5441, 5451, 5450, 5460, + 5459, 5469, 5468, 5479, 5572, 5578, 5603, 5710, 5719, 5723, + 5730, 5805, 5877, 5953, 5952, 6002, 6006, 6010, 6014, 6018, + 6022, 6001, 6075, 6074, 6082, 6089, 6094, 6102, 6106, 6101, + 6116, 6117, 6121, 6123, 6122, 6131, 6130, 6143, 6166, 6141, + 6192, 6219, 6190, 6243, 6244, 6245, 6249, 6250, 6254, 6283, + 6315, 6359, 6363, 6313, 6380, 6389, 6407, 6418, 6417, 6455, + 6506, 6510, 6453, 6527, 6531, 6538, 6542, 6546, 6550, 6554, + 6558, 6562, 6566, 6570, 6574, 6582, 6613, 6626, 6633, 6658, + 6676, 6683, 6698, 6705, 6715, 6719, 6738, 6746, 6714, 6761, + 6776, 6780, 6781, 6785, 6786, 6788, 6787, 6798, 6865, 6913, + 6929, 6942, 6949, 7008, 7016, 7020, 7015, 7081, 7085, 7080, + 7098, 7099, 7104, 7103, 7112, 7111, 7120, 7119, 7128, 7127 }; #endif -#if YYDEBUG || YYERROR_VERBOSE || 0 +/** Accessing symbol of state STATE. */ +#define YY_ACCESSING_SYMBOL(State) YY_CAST (yysymbol_kind_t, yystos[State]) + +#if YYDEBUG || 0 +/* The user-facing name of the symbol whose (internal) number is + YYSYMBOL. No bounds checking. */ +static const char *yysymbol_name (yysymbol_kind_t yysymbol) YY_ATTRIBUTE_UNUSED; + /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { - "$end", "error", "$undefined", "IDENTIFIER", "IDL_CONST", "IDL_MODULE", - "IDL_INTERFACE", "IDL_TYPEDEF", "IDL_LONG", "IDL_SHORT", "IDL_UNSIGNED", - "IDL_DOUBLE", "IDL_FLOAT", "IDL_CHAR", "IDL_WCHAR", "IDL_OCTET", - "IDL_BOOLEAN", "IDL_FIXED", "IDL_ANY", "IDL_OBJECT", "IDL_STRUCT", - "IDL_UNION", "IDL_SWITCH", "IDL_ENUM", "IDL_SEQUENCE", "IDL_STRING", - "IDL_WSTRING", "IDL_EXCEPTION", "IDL_CASE", "IDL_DEFAULT", - "IDL_READONLY", "IDL_ATTRIBUTE", "IDL_ONEWAY", "IDL_IDEMPOTENT", - "IDL_VOID", "IDL_IN", "IDL_OUT", "IDL_INOUT", "IDL_RAISES", - "IDL_CONTEXT", "IDL_NATIVE", "IDL_LOCAL", "IDL_ABSTRACT", "IDL_CUSTOM", - "IDL_FACTORY", "IDL_PRIVATE", "IDL_PUBLIC", "IDL_SUPPORTS", + "\"end of file\"", "error", "\"invalid token\"", "IDENTIFIER", + "IDL_CONST", "IDL_MODULE", "IDL_INTERFACE", "IDL_TYPEDEF", "IDL_LONG", + "IDL_SHORT", "IDL_UNSIGNED", "IDL_DOUBLE", "IDL_FLOAT", "IDL_CHAR", + "IDL_WCHAR", "IDL_OCTET", "IDL_BOOLEAN", "IDL_FIXED", "IDL_ANY", + "IDL_OBJECT", "IDL_STRUCT", "IDL_UNION", "IDL_SWITCH", "IDL_ENUM", + "IDL_SEQUENCE", "IDL_STRING", "IDL_WSTRING", "IDL_EXCEPTION", "IDL_CASE", + "IDL_DEFAULT", "IDL_READONLY", "IDL_ATTRIBUTE", "IDL_ONEWAY", + "IDL_IDEMPOTENT", "IDL_VOID", "IDL_IN", "IDL_OUT", "IDL_INOUT", + "IDL_RAISES", "IDL_CONTEXT", "IDL_NATIVE", "IDL_LOCAL", "IDL_ABSTRACT", + "IDL_CUSTOM", "IDL_FACTORY", "IDL_PRIVATE", "IDL_PUBLIC", "IDL_SUPPORTS", "IDL_TRUNCATABLE", "IDL_VALUETYPE", "IDL_COMPONENT", "IDL_CONSUMES", "IDL_EMITS", "IDL_EVENTTYPE", "IDL_FINDER", "IDL_GETRAISES", "IDL_HOME", "IDL_IMPORT", "IDL_MULTIPLE", "IDL_PRIMARYKEY", "IDL_PROVIDES", @@ -751,87 +1351,93 @@ static const char *const yytname[] = "template_module_inst", "$@27", "$@28", "interface_def", "interface", "$@29", "$@30", "$@31", "interface_decl", "$@32", "interface_header", "inheritance_spec", "$@33", "value_def", "valuetype", - "value_concrete_decl", "$@34", "$@35", "$@36", "value_abs_decl", "$@37", + "value_concrete_decl", "@34", "$@35", "$@36", "value_abs_decl", "$@37", "$@38", "$@39", "value_header", "$@40", "value_decl", "$@41", "opt_truncatable", "supports_spec", "value_forward_decl", - "value_box_decl", "value_elements", "value_element", "visibility", - "state_member", "exports", "at_least_one_export", "export", "$@42", - "$@43", "$@44", "$@45", "$@46", "$@47", "$@48", "$@49", - "at_least_one_scoped_name", "scoped_names", "$@50", "scoped_name", - "$@51", "$@52", "id", "defining_id", "interface_forward", "const_dcl", - "$@53", "$@54", "$@55", "$@56", "const_type", "expression", "const_expr", + "value_box_decl", "value_elements", "value_element", "@42", "visibility", + "state_member", "exports", "at_least_one_export", "export", "$@43", + "$@44", "$@45", "$@46", "$@47", "$@48", "$@49", "$@50", + "at_least_one_scoped_name", "scoped_names", "$@51", "scoped_name", + "$@52", "$@53", "id", "defining_id", "interface_forward", "const_dcl", + "$@54", "$@55", "$@56", "$@57", "const_type", "expression", "const_expr", "or_expr", "xor_expr", "and_expr", "shift_expr", "add_expr", "mult_expr", "unary_expr", "primary_expr", "literal", "positive_int_expr", - "annotation_dcl", "$@57", "annotation_body", "annotation_statement", - "$@58", "annotation_member_type", "annotation_member", + "annotation_dcl", "$@58", "annotation_body", "annotation_statement", + "$@59", "annotation_member_type", "annotation_member", "annotation_member_default", "at_least_one_annotation", - "annotations_maybe", "annotation_appl", "@59", + "annotations_maybe", "annotation_appl", "@60", "annotation_appl_params_maybe", "annotation_appl_params", "named_annotation_appl_params", "more_named_annotation_appl_params", - "named_annotation_appl_param", "type_dcl", "$@60", "type_declarator", - "$@61", "type_spec", "simple_type_spec", "base_type_spec", + "named_annotation_appl_param", "type_dcl", "$@61", "type_declarator", + "$@62", "type_spec", "simple_type_spec", "base_type_spec", "template_type_spec", "constructed_type_spec", "constructed_forward_type_spec", "at_least_one_declarator", - "declarators", "$@62", "declarator", "at_least_one_simple_declarator", - "simple_declarators", "$@63", "simple_declarator", "complex_declarator", + "declarators", "$@63", "declarator", "at_least_one_simple_declarator", + "simple_declarators", "$@64", "simple_declarator", "complex_declarator", "integer_type", "signed_int", "unsigned_int", "floating_pt_type", "fixed_type", "char_type", "octet_type", "boolean_type", "any_type", - "object_type", "struct_decl", "$@64", "struct_type", "$@65", "$@66", - "$@67", "at_least_one_member", "members", "member", "member_i", "$@68", - "$@69", "$@70", "union_decl", "$@71", "union_type", "$@72", "$@73", - "$@74", "$@75", "$@76", "$@77", "switch_type_spec", - "at_least_one_case_branch", "case_branches", "case_branch", "$@78", - "$@79", "$@80", "at_least_one_case_label", "case_labels", "case_label", - "$@81", "$@82", "$@83", "element_spec", "$@84", "struct_forward_type", - "union_forward_type", "enum_type", "$@85", "$@86", "$@87", "$@88", - "at_least_one_enumerator", "enumerators", "$@89", "enumerator", - "sequence_type_spec", "$@90", "$@91", "seq_head", "$@92", "$@93", - "fixed_type_spec", "string_type_spec", "$@94", "$@95", "string_head", - "wstring_type_spec", "$@96", "$@97", "wstring_head", "array_declarator", - "$@98", "at_least_one_array_dim", "array_dims", "array_dim", "$@99", - "$@100", "attribute", "attribute_readonly", "$@101", "$@102", "$@103", - "$@104", "attribute_readwrite", "$@105", "$@106", "$@107", "$@108", - "exception", "$@109", "$@110", "$@111", "$@112", "operation", "$@113", - "$@114", "$@115", "$@116", "opt_op_attribute", "op_type_spec", - "init_decl", "$@117", "$@118", "$@119", "init_parameter_list", "$@120", - "$@121", "at_least_one_in_parameter", "in_parameters", "$@122", - "in_parameter", "$@123", "$@124", "parameter_list", "$@125", "$@126", - "at_least_one_parameter", "parameters", "$@127", "parameter", "$@128", - "$@129", "param_type_spec", "direction", "opt_raises", "$@130", "$@131", - "opt_getraises", "$@132", "$@133", "opt_setraises", "$@134", "$@135", - "opt_context", "$@136", "$@137", "at_least_one_string_literal", - "string_literals", "$@138", "typeid_dcl", "typeprefix_dcl", "component", - "component_forward_decl", "component_decl", "$@139", "$@140", "$@141", - "component_header", "$@142", "$@143", "component_inheritance_spec", - "$@144", "component_exports", "component_export", "$@145", "$@146", - "$@147", "$@148", "$@149", "$@150", "$@151", "provides_decl", + "object_type", "struct_decl", "$@65", "struct_type", "$@66", "$@67", + "$@68", "at_least_one_member", "members", "member", "member_i", "$@69", + "$@70", "$@71", "union_decl", "$@72", "union_type", "$@73", "$@74", + "$@75", "$@76", "$@77", "$@78", "switch_type_spec", + "at_least_one_case_branch", "case_branches", "case_branch", "$@79", + "$@80", "$@81", "at_least_one_case_label", "case_labels", "case_label", + "$@82", "$@83", "$@84", "element_spec", "$@85", "struct_forward_type", + "union_forward_type", "enum_type", "$@86", "$@87", "$@88", "$@89", + "at_least_one_enumerator", "enumerators", "$@90", "enumerator", + "sequence_type_spec", "$@91", "$@92", "seq_head", "$@93", "$@94", + "fixed_type_spec", "string_type_spec", "$@95", "$@96", "string_head", + "wstring_type_spec", "$@97", "$@98", "wstring_head", "array_declarator", + "$@99", "at_least_one_array_dim", "array_dims", "array_dim", "$@100", + "$@101", "attribute", "attribute_readonly", "$@102", "$@103", "$@104", + "$@105", "attribute_readwrite", "$@106", "$@107", "$@108", "$@109", + "exception", "$@110", "@111", "$@112", "$@113", "operation", "$@114", + "$@115", "$@116", "$@117", "opt_op_attribute", "op_type_spec", + "init_decl", "$@118", "@119", "$@120", "init_parameter_list", "$@121", + "$@122", "at_least_one_in_parameter", "in_parameters", "$@123", + "in_parameter", "$@124", "$@125", "parameter_list", "$@126", "$@127", + "at_least_one_parameter", "parameters", "$@128", "parameter", "$@129", + "$@130", "param_type_spec", "direction", "opt_raises", "$@131", "$@132", + "opt_getraises", "$@133", "$@134", "opt_setraises", "$@135", "$@136", + "opt_context", "$@137", "$@138", "at_least_one_string_literal", + "string_literals", "$@139", "typeid_dcl", "typeprefix_dcl", "component", + "component_forward_decl", "component_decl", "@140", "$@141", "$@142", + "component_header", "$@143", "$@144", "component_inheritance_spec", + "$@145", "component_exports", "component_export", "$@146", "$@147", + "$@148", "$@149", "$@150", "$@151", "$@152", "provides_decl", "interface_type", "uses_decl", "uses_opt_multiple", "opt_multiple", - "emits_decl", "publishes_decl", "consumes_decl", "home_decl", "$@152", - "home_header", "$@153", "$@154", "$@155", "$@156", "$@157", "$@158", - "home_inheritance_spec", "$@159", "primary_key_spec", "home_body", - "$@160", "$@161", "home_exports", "home_export", "$@162", "$@163", - "factory_decl", "$@164", "$@165", "finder_decl", "$@166", "$@167", + "emits_decl", "publishes_decl", "consumes_decl", "home_decl", "$@153", + "home_header", "$@154", "$@155", "$@156", "$@157", "$@158", "$@159", + "home_inheritance_spec", "$@160", "primary_key_spec", "home_body", + "$@161", "$@162", "home_exports", "home_export", "$@163", "$@164", + "factory_decl", "$@165", "$@166", "finder_decl", "$@167", "$@168", "event", "event_forward_decl", "event_concrete_forward_decl", - "event_abs_forward_decl", "event_abs_decl", "$@168", "$@169", "$@170", + "event_abs_forward_decl", "event_abs_decl", "$@169", "$@170", "$@171", "event_abs_header", "event_custom_header", "event_plain_header", - "event_rest_of_header", "$@171", "event_decl", "$@172", "$@173", "$@174", + "event_rest_of_header", "$@172", "event_decl", "@173", "$@174", "$@175", "event_header", "formal_parameter_type", "at_least_one_formal_parameter", "formal_parameters", "formal_parameter", "at_least_one_formal_parameter_name", "formal_parameter_names", - "formal_parameter_name", "porttype_decl", "$@175", "$@176", "$@177", - "$@178", "at_least_one_port_export", "port_exports", "port_export", - "$@179", "$@180", "$@181", "extended_port_decl", - "at_least_one_actual_parameter", "actual_parameters", "actual_parameter", - "connector_decl", "connector_header", "$@182", "$@183", "connector_body", - "$@184", "$@185", "connector_exports", "connector_export", "$@186", - "$@187", "$@188", "$@189", YY_NULLPTR + "formal_parameter_name", "porttype_decl", "$@176", "@177", "$@178", + "$@179", "at_least_one_port_export", "port_exports", "port_export", + "$@180", "extended_port_decl", "at_least_one_actual_parameter", + "actual_parameters", "actual_parameter", "connector_decl", + "connector_header", "$@181", "$@182", "connector_body", "$@183", "$@184", + "connector_exports", "connector_export", "$@185", "$@186", "$@187", + "$@188", YY_NULLPTR }; + +static const char * +yysymbol_name (yysymbol_kind_t yysymbol) +{ + return yytname[yysymbol]; +} #endif -# ifdef YYPRINT +#ifdef YYPRINT /* YYTOKNUM[NUM] -- (External) token number corresponding to the (internal) symbol number NUM (which must be that of a token). */ -static const yytype_uint16 yytoknum[] = +static const yytype_int16 yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, @@ -845,718 +1451,732 @@ static const yytype_uint16 yytoknum[] = 125, 60, 62, 58, 44, 61, 124, 94, 38, 43, 45, 42, 47, 37, 126, 40, 41, 91, 93 }; -# endif +#endif -#define YYPACT_NINF -656 +#define YYPACT_NINF (-613) -#define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-656))) +#define yypact_value_is_default(Yyn) \ + ((Yyn) == YYPACT_NINF) -#define YYTABLE_NINF -539 +#define YYTABLE_NINF (-568) -#define yytable_value_is_error(Yytable_value) \ +#define yytable_value_is_error(Yyn) \ 0 - /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing + /* YYPACTSTATE-NUM -- Index in YYTABLE of the portion describing STATE-NUM. */ static const yytype_int16 yypact[] = { - -656, 127, 1208, -656, -656, -656, -656, -656, -656, -656, - -656, -656, -656, -656, 83, 105, 115, 155, -656, 83, - 83, -656, 44, 44, -656, -656, 83, -656, -656, 98, - -656, 285, 57, 110, -656, -656, 26, -656, -656, -656, - -656, -656, -656, 527, -656, -656, -656, -656, -656, 1339, - 130, -656, -656, 131, -656, 199, -656, -656, -656, -656, - -656, -656, -656, -656, -656, -656, -656, -656, -656, -656, - -656, -656, -656, -656, 147, -656, -656, -656, 147, -656, - -656, 134, 157, 1486, 44, 83, 1462, 83, 83, 83, - 83, -656, -656, -656, 53, 83, 86, -656, 100, 83, - -656, 147, 83, 167, 169, 83, -656, -656, 109, -656, - 111, -656, -656, 181, -656, 186, 189, 692, -656, -656, - -656, 194, 242, -656, 203, 206, 215, 161, -656, 42, - -656, -656, -656, -656, -656, -656, 216, -656, -656, -656, - -656, -656, -656, 230, -656, -656, -656, -656, -656, -656, - -656, -656, -656, -656, -656, -656, -656, -656, -656, -656, - -656, 199, -656, -656, -656, 103, -656, -656, 229, -656, - 238, 243, 244, -656, 44, 249, 251, 248, -656, 252, - 254, 255, 257, 258, 261, 262, 265, -656, -656, -656, - 266, 267, -656, -656, -656, -656, 230, -656, -656, -656, - -656, -656, -656, -656, -656, -656, 230, -656, -656, -656, - -656, -656, -656, -656, -656, 269, -656, 270, -656, -656, - 263, -656, 357, -656, -656, -656, 50, 56, -656, -656, - -656, 1486, -656, -656, -656, -656, 271, -656, -656, -656, - -656, 360, -656, -656, 55, 274, -656, -656, -656, -656, - -656, -656, -656, -656, 361, -656, 154, 279, 324, -656, - -656, -656, -656, -656, -656, 230, -656, -656, 275, -656, - -656, -656, -656, -656, -656, -656, -656, -656, 324, 286, - 287, -656, -656, -656, 83, 83, 293, 295, -656, -656, - -656, 292, -656, 357, -656, -656, -656, -656, -656, -656, - 387, -656, 305, 304, -656, -656, -656, -656, -656, -656, - -656, -656, -656, -656, 188, 188, 188, 154, 230, -656, - -656, 303, 307, 302, 143, 137, 113, -656, -656, -656, - -656, -656, 44, -656, -656, -656, -656, 312, -656, 44, - -656, 154, 154, 154, 296, -656, -656, -656, -656, -656, - -656, -656, 211, -656, -11, -656, -656, -656, -656, -656, - -656, -656, -656, 44, 324, -656, -656, -656, 318, 263, - 90, 1261, 320, 319, -656, 692, -656, -656, -656, 306, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 321, 83, -656, 230, 983, -656, 554, 154, -656, -656, - -656, -656, -656, 154, -656, 637, -656, -656, -656, 410, - 899, -656, -656, -656, -656, 41, 355, 44, 44, -656, - -656, -656, -656, -656, 41, -656, 326, -656, 322, -656, - 327, -656, -656, 1018, 230, -656, 44, 324, -656, -656, - -656, -656, 330, -656, -656, 83, -656, -656, 332, 336, - 424, 339, -656, -656, 307, 302, 143, 137, 137, 113, - 113, -656, -656, -656, -656, -656, 335, -656, -656, -656, - 340, -656, -656, 1429, -656, -656, -656, -656, 676, -656, - -656, -656, -656, -656, 341, -656, 773, -656, -656, 344, - 342, 873, 346, 347, 350, 338, -656, 337, -656, 353, - -656, -656, -656, 354, 362, 197, 44, 44, 44, -656, - 370, -656, -656, -656, -656, -656, -656, -656, 83, 83, - -656, 376, -656, -656, -656, 1103, 815, 405, 1075, -656, - 230, 357, -656, -656, 68, 70, 379, 380, 384, 357, - 385, -656, -656, 71, -656, 60, -656, -656, 386, 390, - 230, -656, 136, 1462, -656, 421, -656, -656, -656, -656, - 55, -656, 389, -656, 393, -656, 394, 399, 400, 401, - -656, 230, -656, -656, -656, -656, -656, 402, 403, -656, - -656, -656, -656, -656, -656, -656, -656, -656, 154, -656, - 357, -656, 404, 83, -656, -656, 466, 230, -656, -656, - -656, -656, -656, -656, 81, 81, 81, 407, -656, 408, - 409, 411, 412, 413, 414, -656, -656, -656, 417, 419, - 420, 427, -656, -656, -656, -656, -656, -656, -656, -656, - -656, -656, 154, -656, -656, -656, 83, -656, 428, 425, - 430, -656, 432, -656, -656, -656, -656, -656, 423, 154, - 426, 1286, -656, 44, -656, -656, -656, -656, -656, -656, - 490, -656, -656, 66, -656, 338, 353, -656, -656, 416, - -656, -656, -656, -656, -656, -656, -656, -656, -656, -656, - 418, 418, -656, -656, -656, -656, 1075, 83, -656, 154, - 422, -656, -656, -656, -656, -656, 436, 437, 438, 442, - 136, -656, -656, -656, 44, -656, -656, -656, -656, 439, - 230, -656, -656, -656, 440, -656, 498, -656, -656, -656, - -656, -656, -656, -656, -656, 44, -656, -656, -656, -656, - -656, 230, 459, 1154, -656, 449, 418, -656, 467, 453, - 525, 538, 538, 83, 523, 488, 475, -656, 230, 499, - -656, -656, 483, -656, -656, -656, -656, -656, 485, -656, - -656, -656, -656, -656, -656, -656, -656, -656, 533, 592, - 491, 212, 538, 538, 174, 1075, -656, 502, 496, 538, - 497, 541, 83, 44, -656, -656, 512, -656, -656, -656, - -656, -656, 500, -656, -656, -656, -656, -656, -656, -656, - -656, -656, -656, -656, -656, -656, -656, -656, -656, -656, - -656, -656, 230, -656, 511, -656, 513, 1075, 570, 522, - 154, 519, 524, 54, -656, 268, 83, 525, 44, 44, - 508, 83, 592, -656, -656, -656, -656, -656, -656, -656, - -656, -656, 1403, -656, -656, -656, 515, 516, -656, -656, - -656, 212, 83, 514, 530, -656, -656, -656, -656, 44, - -656, -656, -656, -656, 83, 536, 520, 550, -656, -656, - -656, -656, 521, 534, -656, -656, 555, -656 + -613, 52, 1211, -613, -613, -613, -613, -613, -613, -613, + -613, -613, -613, -613, 57, 78, 45, 157, -613, 57, + 57, -613, 85, 85, -613, -613, 57, -613, -613, 12, + -613, 237, -17, 9, -613, -613, -20, -613, -613, -613, + -613, -613, -613, 537, -613, -613, -613, -613, -613, 1342, + 32, -613, -613, 44, -613, 119, -613, -613, -613, -613, + -613, -613, -613, -613, -613, -613, -613, -613, -613, -613, + -613, -613, -613, -613, 111, -613, -613, -613, 111, -613, + -613, 75, 132, 857, 85, 57, 1556, 57, 57, 57, + 57, -613, -613, -613, -19, 57, 77, -613, 107, 57, + -613, 111, 57, 134, 144, 57, -613, -613, -25, -613, + 1, 256, -613, 151, -613, 173, 184, 331, -613, -613, + -613, 199, 251, -613, 218, 220, 229, 207, -613, 190, + -613, -613, -613, -613, -613, -613, 234, -613, -613, -613, + -613, -613, -613, 239, -613, -613, -613, -613, -613, -613, + -613, -613, -613, -613, -613, -613, -613, -613, -613, -613, + -613, 119, -613, -613, -613, 65, -613, -613, 236, -613, + 241, 245, 246, -613, 85, 249, 252, 250, -613, 255, + 257, 265, 268, 270, 269, 271, 273, -613, -613, -613, + 274, 275, -613, -613, -613, -613, 239, -613, -613, -613, + -613, -613, -613, -613, -613, -613, 239, -613, -613, -613, + -613, -613, -613, -613, -613, 278, -613, 280, -613, -613, + 235, -613, 341, -613, -613, -613, -613, 55, -613, -613, + -613, 857, -613, -613, -613, -613, 281, -613, -613, -613, + -613, 367, -613, -613, 50, 293, -613, -613, -613, -613, + -613, -613, -613, -613, 363, -613, 171, 287, 343, -613, + -613, -613, -613, -613, -613, 239, -613, -613, 292, -613, + -613, -613, -613, -613, -613, -613, -613, -613, 343, 302, + 310, -613, -613, -613, 57, 57, 311, 312, -613, -613, + -613, 313, -613, 341, 315, -613, -613, -613, -613, -613, + 402, -613, 318, 319, -613, -613, -613, -613, -613, -613, + -613, -613, -613, -613, 204, 204, 204, 171, 239, -613, + -613, 316, 324, 309, 131, 135, 136, -613, -613, -613, + -613, -613, 85, -613, -613, -613, -613, 321, -613, 85, + -613, 171, 171, 171, 317, -613, -613, -613, -613, -613, + -613, -613, 159, -613, 71, -613, -613, -613, -613, -613, + -613, -613, -613, 85, 343, -613, -613, -613, -613, 235, + 689, 1264, 326, 333, -613, 331, -613, -613, -613, 320, + 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, + 334, 57, -613, 239, 986, -613, 564, 171, -613, -613, + -613, -613, -613, 171, -613, 876, -613, -613, -613, 601, + 902, -613, -613, -613, -613, 98, 369, 85, 85, -613, + -613, -613, -613, -613, 98, -613, 339, -613, 335, -613, + 337, -613, -613, 1021, 239, -613, 85, 343, -613, -613, + -613, -613, 344, -613, -613, 57, -613, -613, 345, 346, + 431, 348, -613, -613, 324, 309, 131, 135, 135, 136, + 136, -613, -613, -613, -613, -613, 347, -613, -613, -613, + 349, -613, -613, 1497, -613, -613, -613, -613, 463, -613, + -613, -613, -613, -613, 350, -613, 1531, -613, -613, 1422, + -613, 351, 1079, 352, 358, 360, 364, -613, 336, -613, + 359, -613, -613, -613, 372, 373, 130, 85, 85, 85, + 461, -613, 377, -613, -613, -613, -613, -613, -613, -613, + 57, 57, -613, 379, -613, -613, -613, 1106, 817, 452, + 96, -613, 239, 341, -613, -613, 88, 90, 405, 406, + 407, 341, 408, -613, -613, 86, -613, 60, -613, -613, + 400, 409, 239, -613, 410, 137, 1556, -613, 469, -613, + -613, -613, -613, 50, -613, 413, -613, 414, -613, 415, + 416, 417, 421, -613, 239, -613, -613, -613, -613, -613, + 426, 429, 517, -613, -613, -613, 435, -613, -613, -613, + -613, -613, 171, -613, 341, -613, 437, 57, -613, -613, + 519, 239, -613, -613, -613, -613, -613, -613, 113, 113, + 113, -613, 440, -613, 443, 444, 445, 447, 448, 450, + -613, -613, -613, 451, 453, 474, 476, -613, -613, -613, + -613, -613, -613, -613, -613, -613, -613, 171, -613, -613, + -613, 57, -613, 479, 465, 496, -613, 522, 502, 137, + -613, 454, 505, -613, 511, 171, 512, 1289, -613, 85, + -613, -613, -613, -613, -613, -613, 598, -613, -613, -613, + -613, -613, 364, 359, -613, -613, 497, -613, -613, -613, + -613, -613, -613, -613, -613, -613, -613, 501, 501, -613, + -613, -613, -613, 96, 57, -613, 171, 495, -613, -613, + -613, -613, -613, -613, -613, 523, -613, -613, -613, -613, + -613, 85, -613, -613, -613, -613, 524, 239, -613, 501, + -613, 525, -613, 572, -613, -613, -613, -613, -613, -613, + -613, -613, 85, -613, 239, 526, 1157, -613, 509, -613, + -613, 528, 513, 580, 582, 582, 57, 566, 532, 514, + -613, 239, 538, -613, -613, 527, -613, 582, -613, -613, + -613, 529, -613, -613, -613, -613, -613, -613, -613, -613, + -613, 575, 633, 533, 230, 582, -613, 202, 96, -613, + 544, 535, 582, 536, 581, 57, 85, -613, -613, 550, + -613, -613, -613, -613, -613, 540, -613, -613, -613, -613, + -613, -613, -613, -613, -613, -613, -613, -613, -613, -613, + -613, -613, -613, -613, 239, -613, 553, -613, 554, 96, + 605, 562, 171, 563, 565, 58, -613, 240, 57, 580, + 85, 85, 552, 57, 633, -613, -613, -613, -613, -613, + -613, -613, -613, -613, 708, -613, -613, -613, 558, 559, + -613, -613, -613, 230, 57, 555, 574, -613, -613, -613, + -613, 85, -613, -613, -613, -613, 57, 570, 571, 584, + -613, -613, -613, -613, 573, 578, -613, -613, 593, -613 }; - /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. + /* YYDEFACTSTATE-NUM -- Default reduction number in state STATE-NUM. Performed when YYTABLE does not specify something else to do. Zero means the default is an error. */ -static const yytype_uint16 yydefact[] = +static const yytype_int16 yydefact[] = { - 4, 0, 0, 3, 1, 38, 145, 40, 70, 222, - 283, 298, 333, 381, 0, 0, 0, 0, 94, 0, - 0, 492, 0, 0, 561, 582, 0, 6, 7, 42, + 4, 0, 0, 3, 1, 38, 147, 40, 70, 224, + 285, 300, 335, 383, 0, 0, 0, 0, 94, 0, + 0, 495, 0, 0, 564, 584, 0, 6, 7, 42, 24, 61, 0, 0, 22, 64, 77, 66, 26, 78, 83, 79, 84, 77, 80, 81, 65, 18, 10, 0, - 0, 12, 228, 285, 224, 332, 225, 251, 252, 226, - 20, 14, 16, 28, 452, 451, 454, 30, 490, 32, - 522, 524, 523, 521, 77, 540, 541, 520, 77, 34, + 0, 12, 230, 287, 226, 334, 227, 253, 254, 228, + 20, 14, 16, 28, 454, 453, 456, 30, 493, 32, + 525, 527, 526, 524, 77, 543, 544, 523, 77, 34, 36, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 141, 263, 227, 77, 0, 77, 88, 77, 0, - 82, 77, 0, 458, 533, 0, 140, 136, 0, 135, - 0, 211, 211, 0, 46, 0, 0, 0, 211, 8, - 9, 0, 97, 72, 0, 0, 0, 267, 269, 0, - 273, 274, 277, 278, 279, 280, 276, 281, 282, 347, - 355, 360, 92, 235, 102, 231, 233, 234, 232, 236, - 265, 266, 237, 241, 238, 240, 239, 242, 243, 285, - 248, 0, 249, 250, 244, 0, 247, 245, 354, 246, - 359, 0, 0, 5, 0, 209, 0, 0, 300, 0, - 0, 0, 0, 0, 0, 0, 0, 534, 527, 536, - 0, 0, 585, 581, 39, 276, 158, 146, 150, 154, - 155, 151, 152, 153, 156, 157, 41, 71, 223, 229, - 284, 299, 334, 382, 73, 531, 74, 0, 532, 95, - 463, 493, 0, 449, 138, 450, 0, 0, 195, 43, - 25, 0, 547, 543, 544, 549, 546, 550, 548, 545, - 542, 0, 48, 554, 0, 0, 23, 96, 75, 67, - 27, 85, 268, 275, 270, 272, 0, 0, 99, 346, - 343, 351, 356, 19, 11, 212, 13, 286, 0, 21, - 15, 17, 29, 455, 31, 504, 491, 33, 99, 0, - 0, 35, 37, 589, 0, 0, 0, 0, 89, 461, - 459, 501, 137, 0, 562, 210, 583, 198, 4, 551, - 0, 555, 0, 552, 184, 185, 186, 188, 191, 190, - 192, 193, 189, 187, 0, 0, 0, 0, 181, 580, - 159, 160, 161, 163, 165, 167, 170, 173, 177, 182, - 579, 62, 0, 112, 104, 271, 194, 0, 348, 0, - 93, 0, 0, 0, 215, 211, 301, 465, 508, 535, - 528, 537, 586, 147, 263, 230, 256, 257, 258, 264, - 335, 383, 112, 0, 99, 499, 494, 139, 0, 463, - 0, 0, 3, 0, 49, 0, 178, 179, 180, 0, + 0, 143, 265, 229, 77, 0, 77, 88, 77, 0, + 82, 77, 0, 460, 536, 0, 142, 138, 0, 137, + 0, 0, 213, 0, 46, 0, 0, 0, 213, 8, + 9, 0, 97, 72, 0, 0, 0, 269, 271, 0, + 275, 276, 279, 280, 281, 282, 278, 283, 284, 349, + 357, 362, 92, 237, 102, 233, 235, 236, 234, 238, + 267, 268, 239, 243, 240, 242, 241, 244, 245, 287, + 250, 0, 251, 252, 246, 0, 249, 247, 356, 248, + 361, 0, 0, 5, 0, 211, 0, 0, 302, 0, + 0, 0, 0, 0, 0, 0, 0, 537, 530, 539, + 0, 0, 587, 583, 39, 278, 160, 148, 152, 156, + 157, 153, 154, 155, 158, 159, 41, 71, 225, 231, + 286, 301, 336, 384, 73, 534, 74, 0, 535, 95, + 465, 496, 0, 451, 140, 452, 565, 0, 197, 43, + 25, 0, 550, 546, 547, 552, 549, 553, 551, 548, + 545, 0, 48, 557, 0, 0, 23, 96, 75, 67, + 27, 85, 270, 277, 272, 274, 0, 0, 99, 348, + 345, 353, 358, 19, 11, 214, 13, 288, 0, 21, + 15, 17, 29, 457, 31, 507, 494, 33, 99, 0, + 0, 35, 37, 591, 0, 0, 0, 0, 89, 463, + 461, 504, 139, 0, 0, 585, 212, 200, 4, 554, + 0, 558, 0, 555, 186, 187, 188, 190, 193, 192, + 194, 195, 191, 189, 0, 0, 0, 0, 183, 582, + 161, 162, 163, 165, 167, 169, 172, 175, 179, 184, + 581, 62, 0, 114, 105, 273, 196, 0, 350, 0, + 93, 0, 0, 0, 217, 213, 303, 468, 511, 538, + 531, 540, 588, 149, 265, 232, 258, 259, 260, 266, + 337, 385, 114, 0, 99, 502, 497, 141, 566, 465, + 0, 0, 3, 0, 49, 0, 180, 181, 182, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 577, 0, 76, 134, 0, 111, 0, 0, 211, 98, - 344, 352, 357, 0, 213, 0, 287, 291, 211, 456, - 0, 112, 104, 371, 376, 0, 486, 0, 0, 594, - 369, 370, 590, 592, 0, 596, 0, 588, 0, 211, - 253, 211, 291, 0, 462, 460, 0, 99, 563, 584, - 202, 196, 0, 204, 197, 0, 199, 205, 0, 0, - 0, 0, 553, 183, 162, 164, 166, 168, 169, 171, - 172, 174, 175, 176, 211, 63, 131, 129, 391, 392, - 0, 114, 121, 0, 115, 125, 123, 127, 0, 117, - 119, 396, 109, 108, 0, 103, 0, 105, 106, 0, - 0, 0, 0, 0, 0, 135, 216, 0, 217, 220, - 296, 293, 292, 0, 211, 0, 0, 0, 0, 476, - 0, 464, 466, 468, 470, 472, 474, 478, 0, 0, - 509, 0, 507, 510, 512, 0, 0, 0, 0, 482, - 481, 0, 485, 484, 0, 0, 0, 0, 0, 0, - 0, 587, 148, 0, 254, 0, 336, 341, 211, 0, - 500, 495, 0, 0, 200, 208, 201, 45, 556, 50, - 0, 132, 0, 69, 0, 113, 0, 0, 0, 0, - 395, 425, 422, 423, 424, 386, 394, 0, 0, 211, - 87, 110, 107, 350, 349, 345, 353, 358, 0, 214, - 0, 218, 0, 0, 288, 290, 267, 312, 307, 308, - 309, 310, 302, 311, 0, 0, 0, 0, 457, 0, - 0, 0, 0, 0, 0, 514, 517, 506, 0, 0, - 0, 0, 372, 377, 480, 575, 576, 595, 591, 593, - 483, 597, 0, 366, 362, 365, 0, 342, 0, 338, - 0, 91, 0, 573, 569, 571, 564, 568, 0, 0, - 0, 0, 578, 0, 130, 122, 116, 126, 124, 128, - 0, 118, 120, 0, 221, 0, 220, 297, 294, 0, - 489, 487, 488, 477, 467, 469, 471, 473, 475, 479, - 0, 0, 511, 513, 530, 539, 0, 0, 149, 0, - 363, 255, 337, 339, 385, 496, 0, 0, 0, 0, - 566, 203, 207, 206, 0, 56, 42, 51, 55, 0, - 133, 387, 397, 219, 0, 303, 400, 515, 518, 373, - 378, 262, 367, 364, 211, 0, 574, 570, 572, 565, - 567, 58, 0, 0, 57, 0, 0, 295, 0, 0, - 0, 432, 432, 0, 436, 259, 0, 340, 497, 0, - 52, 54, 413, 388, 398, 304, 401, 408, 0, 407, - 429, 516, 519, 374, 433, 379, 260, 368, 503, 0, - 0, 0, 432, 432, 0, 0, 403, 404, 0, 432, - 0, 440, 0, 0, 498, 560, 0, 559, 412, 426, - 427, 428, 0, 418, 419, 389, 399, 319, 326, 324, - 305, 315, 316, 323, 409, 405, 430, 375, 434, 437, - 380, 261, 502, 59, 557, 414, 415, 0, 444, 0, - 0, 0, 0, 0, 211, 321, 0, 0, 0, 0, - 0, 0, 0, 416, 420, 441, 390, 320, 327, 325, - 306, 314, 0, 322, 410, 406, 0, 0, 438, 60, - 558, 0, 0, 0, 0, 329, 317, 431, 435, 0, - 417, 421, 442, 328, 0, 0, 0, 0, 330, 318, - 439, 448, 0, 445, 443, 446, 0, 447 + 579, 0, 76, 136, 0, 113, 0, 0, 213, 98, + 346, 354, 359, 0, 215, 0, 289, 293, 213, 213, + 0, 114, 105, 373, 378, 0, 489, 0, 0, 596, + 371, 372, 592, 594, 0, 598, 0, 590, 0, 213, + 255, 213, 293, 0, 464, 462, 0, 99, 572, 586, + 204, 198, 0, 206, 199, 0, 201, 207, 0, 0, + 0, 0, 556, 185, 164, 166, 168, 170, 171, 173, + 174, 176, 177, 178, 213, 63, 133, 131, 393, 394, + 0, 116, 123, 0, 117, 127, 125, 129, 0, 119, + 121, 398, 111, 110, 0, 104, 0, 106, 107, 0, + 108, 0, 0, 0, 0, 0, 137, 218, 0, 219, + 222, 298, 295, 294, 0, 213, 0, 0, 0, 0, + 0, 479, 0, 467, 469, 471, 473, 475, 477, 481, + 0, 0, 512, 0, 510, 513, 515, 0, 0, 0, + 0, 485, 484, 0, 488, 487, 0, 0, 0, 0, + 0, 0, 0, 589, 150, 0, 256, 0, 338, 343, + 213, 0, 503, 498, 571, 213, 0, 202, 210, 203, + 45, 559, 50, 0, 134, 0, 69, 0, 115, 0, + 0, 0, 0, 397, 427, 424, 425, 426, 388, 396, + 0, 0, 0, 87, 112, 103, 0, 352, 351, 347, + 355, 360, 0, 216, 0, 220, 0, 0, 290, 292, + 269, 314, 309, 310, 311, 312, 304, 313, 0, 0, + 0, 466, 0, 459, 0, 0, 0, 0, 0, 0, + 517, 520, 509, 0, 0, 0, 0, 374, 379, 483, + 577, 578, 597, 593, 595, 486, 599, 0, 368, 364, + 367, 0, 344, 0, 340, 0, 91, 0, 0, 0, + 575, 0, 0, 570, 0, 0, 0, 0, 580, 0, + 132, 124, 118, 128, 126, 130, 0, 120, 122, 399, + 109, 223, 0, 222, 299, 296, 0, 492, 490, 491, + 480, 470, 472, 474, 476, 478, 482, 0, 0, 514, + 516, 533, 542, 0, 0, 151, 0, 365, 257, 339, + 341, 387, 499, 568, 569, 0, 573, 574, 205, 209, + 208, 0, 56, 42, 51, 55, 0, 135, 389, 0, + 221, 0, 305, 402, 518, 521, 375, 380, 264, 369, + 366, 213, 0, 576, 58, 0, 0, 57, 0, 400, + 297, 0, 0, 0, 434, 434, 0, 438, 261, 0, + 342, 500, 0, 52, 54, 415, 390, 434, 306, 403, + 410, 0, 409, 431, 519, 522, 376, 435, 381, 262, + 370, 506, 0, 0, 0, 434, 401, 0, 0, 405, + 406, 0, 434, 0, 442, 0, 0, 501, 563, 0, + 562, 414, 428, 429, 430, 0, 420, 421, 391, 321, + 328, 326, 307, 317, 318, 325, 411, 407, 432, 377, + 436, 439, 382, 263, 505, 59, 560, 416, 417, 0, + 446, 0, 0, 0, 0, 0, 213, 323, 0, 0, + 0, 0, 0, 0, 0, 418, 422, 443, 392, 322, + 329, 327, 308, 316, 0, 324, 412, 408, 0, 0, + 440, 60, 561, 0, 0, 0, 0, 331, 319, 433, + 437, 0, 419, 423, 444, 330, 0, 0, 0, 0, + 332, 320, 441, 450, 0, 447, 445, 448, 0, 449 }; - /* YYPGOTO[NTERM-NUM]. */ + /* YYPGOTONTERM-NUM. */ static const yytype_int16 yypgoto[] = { - -656, -656, 331, 334, 584, -595, -656, -656, -656, -656, - -656, -656, -656, -656, -656, -656, -656, -656, -656, -656, - -656, -583, -656, -656, -656, -656, -656, -656, -656, -656, - -656, -656, -656, -656, -656, -656, -99, -656, -656, -656, - -656, -656, -656, -656, -656, -656, -656, -656, 283, -656, - -656, 207, -656, -656, -656, 619, -656, -656, -656, -656, - -656, -656, -656, 621, -656, 298, -656, -656, -238, -656, - -656, 231, -656, -656, -656, -288, -656, -353, -656, -656, - -656, -656, -656, -656, -656, -656, -325, -656, -656, -22, - -656, -656, -181, -10, -656, 16, -656, -656, -656, -656, - -189, 9, -227, -656, 290, 278, 260, -65, -58, -137, - -28, -656, -311, -656, -656, -656, -656, -656, -656, -656, - -656, 20, -85, 615, -656, -656, -656, -656, 0, 85, - 17, -656, 118, -656, -31, 182, -440, -656, -656, -656, - 88, -656, -656, -608, -67, -656, -656, -7, -656, -68, - -656, -656, -49, -44, -54, -48, -46, 308, -656, -41, - -656, -38, -656, -656, -656, -656, 272, 352, 213, -656, - -656, -656, -37, -656, -32, -656, -656, -656, -656, -656, - -656, -656, -656, -656, -140, -656, -656, -656, -656, -656, - -119, -656, -656, -656, -656, -656, -656, -656, -40, -656, - -656, -656, -656, -656, -656, -656, -17, -656, -656, -656, - -656, -656, -656, -656, -75, -656, -656, -656, -70, -656, - -656, -656, -656, -656, -656, -656, 19, -656, -656, -328, - -656, -656, -656, -656, -656, -656, -656, -656, -656, -656, - 18, -656, -656, -656, -656, -656, -656, -656, -656, -656, - -656, -656, -656, -656, -656, -656, -571, -656, -656, -656, - -656, -656, -116, -656, -656, -656, -656, -656, -656, -656, - -656, -143, -656, -656, -492, -656, -655, -656, -656, -656, - -656, -656, -656, -656, -656, -656, -656, -656, -656, -656, - -656, 21, 23, -656, -656, -656, -656, -656, -656, -656, - -656, -656, 345, -656, -656, -656, -656, -656, -656, -656, - -656, -656, -656, -300, 297, -261, -656, -656, -656, -656, - -656, -656, -656, -656, -656, -656, -656, -656, -656, -656, - -656, -656, -656, -656, -656, -656, -656, -656, -656, -656, - -656, -656, -656, -656, -656, -656, -656, -656, -656, -656, - -656, -656, -656, -656, -656, -656, -656, 639, -656, -656, - -656, -656, -656, -656, -656, -656, -656, 348, -656, -656, - -112, -656, -656, -656, -656, -656, -656, -656, 22, -656, - -656, -656, 316, -656, -656, 166, -656, -656, -656, -656, - -656, -656, -656, -656, -656, -656, -656, -656, -656 + -613, -613, 378, 382, 632, -585, -613, -613, -613, -613, + -613, -613, -613, -613, -613, -613, -613, -613, -613, -613, + -613, -576, -613, -613, -613, -613, -613, -613, -613, -613, + -613, -613, -613, -613, -613, -613, -54, -613, -613, -613, + -613, -613, -613, -613, -613, -613, -613, -613, 279, -613, + -613, 127, -613, -613, -613, 666, -613, -613, -613, -613, + -613, -613, -613, 669, -613, 286, -613, -613, -246, -613, + -613, 276, 197, -613, -613, -613, -315, -613, -353, -613, + -613, -613, -613, -613, -613, -613, -613, -324, -613, -613, + -22, -613, -613, -191, -10, -613, 6, -613, -613, -613, + -613, -189, 53, -217, -613, 314, 332, 353, -78, -73, + -96, -18, -613, -302, -613, -613, -613, -613, -613, -613, + -613, -613, 15, -82, 645, -613, -613, -613, -613, 64, + 146, 16, -613, 174, -613, -31, 253, -440, -613, -613, + -613, 141, -613, -613, -612, -5, -613, -613, -7, -613, + -59, -613, -613, -46, -39, -55, -49, -48, 376, -613, + -40, -613, -38, -613, -613, -613, -613, 323, 398, 261, + -613, -613, -613, -37, -613, -32, -613, -613, -613, -613, + -613, -613, -613, -613, -613, -77, -613, -613, -613, -613, + -613, -76, -613, -613, -613, -613, -613, -613, -613, -41, + -613, -613, -613, -613, -613, -613, -613, 27, -613, -613, + -613, -613, -613, -613, -613, -70, -613, -613, -613, -69, + -613, -613, -613, -613, -613, -613, -613, 62, -613, -613, + -326, -613, -613, -613, -613, -613, -613, -613, -613, -613, + -613, 17, -613, -613, -613, -613, -613, -613, -613, -613, + -613, -613, -613, -613, -613, -613, -613, -532, -613, -613, + -613, -613, -613, -68, -613, -613, -613, -613, -613, -613, + -613, -613, -93, -613, -613, -505, -613, -549, -613, -613, + -613, -613, -613, -613, -613, -613, -613, -613, -613, -613, + -613, -613, 18, 21, -613, -613, -613, -613, -613, -613, + -613, -613, -613, 393, -613, -613, 258, -613, -613, -613, + -613, -613, -613, -613, -330, 342, -319, -613, -613, -613, + -613, -613, -613, -613, -613, -613, -613, -613, -613, -613, + -613, -613, -613, -613, -613, -613, -613, -613, -613, -613, + -613, -613, -613, -613, -613, -613, -613, -613, -613, -613, + -613, -613, -613, -613, -613, -613, -613, -613, 685, -613, + -613, -613, -613, -613, -613, -613, -613, -613, 390, -613, + -613, -67, -613, -613, -613, -613, -613, -613, -613, 120, + -613, 419, -613, -613, 209, -613, -613, -613, -613, -613, + -613, -613, -613, -613, -613, -613, -613, -613 }; - /* YYDEFGOTO[NTERM-NUM]. */ + /* YYDEFGOTONTERM-NUM. */ static const yytype_int16 yydefgoto[] = { -1, 1, 2, 3, 27, 28, 172, 176, 180, 181, 171, 179, 121, 116, 125, 182, 184, 186, 190, 191, 82, 29, 84, 30, 115, 298, 449, 31, 32, 117, - 302, 451, 651, 732, 707, 733, 708, 709, 749, 831, + 302, 451, 657, 735, 714, 736, 715, 716, 752, 833, 33, 118, 391, 34, 35, 124, 333, 470, 36, 85, 37, 142, 332, 38, 39, 40, 126, 334, 484, 41, - 217, 362, 549, 42, 258, 43, 102, 248, 340, 44, - 45, 396, 485, 486, 487, 394, 395, 471, 566, 577, - 578, 564, 568, 567, 569, 562, 392, 466, 653, 318, - 222, 293, 109, 354, 46, 472, 83, 284, 428, 632, - 197, 319, 336, 321, 322, 323, 324, 325, 326, 327, - 328, 329, 337, 48, 297, 370, 444, 553, 445, 446, - 650, 473, 50, 295, 344, 404, 497, 498, 591, 499, - 474, 86, 208, 285, 209, 145, 146, 147, 148, 52, - 355, 430, 636, 356, 720, 745, 782, 357, 358, 149, - 150, 151, 152, 153, 154, 155, 156, 157, 158, 53, - 87, 54, 177, 345, 503, 406, 504, 595, 502, 593, - 714, 592, 55, 88, 56, 268, 408, 669, 738, 774, - 822, 602, 800, 823, 801, 824, 865, 819, 802, 825, - 803, 821, 820, 854, 856, 864, 57, 58, 59, 89, - 286, 431, 638, 546, 639, 724, 547, 164, 341, 492, - 165, 257, 398, 166, 167, 342, 493, 168, 169, 343, - 494, 170, 359, 429, 634, 690, 635, 689, 746, 475, - 420, 527, 686, 743, 779, 421, 528, 687, 744, 781, - 476, 90, 287, 432, 640, 477, 660, 735, 772, 818, - 478, 575, 489, 579, 736, 773, 717, 739, 740, 758, - 777, 827, 759, 775, 826, 753, 770, 771, 792, 816, - 851, 793, 817, 852, 576, 794, 761, 778, 828, 765, - 780, 829, 810, 830, 859, 836, 853, 867, 872, 873, - 876, 479, 480, 63, 64, 65, 183, 347, 510, 66, - 220, 364, 290, 363, 409, 511, 609, 610, 611, 612, - 613, 607, 614, 644, 531, 645, 424, 533, 514, 515, - 516, 67, 185, 68, 105, 291, 437, 642, 725, 768, - 366, 436, 784, 276, 348, 521, 410, 522, 618, 619, - 523, 680, 741, 524, 681, 742, 69, 70, 71, 72, - 73, 279, 411, 620, 74, 75, 76, 188, 278, 77, - 280, 412, 621, 78, 241, 242, 303, 243, 786, 814, - 787, 79, 111, 368, 552, 699, 646, 700, 647, 697, - 698, 696, 425, 245, 390, 330, 80, 81, 112, 369, - 193, 283, 426, 352, 427, 537, 538, 536, 540 + 217, 362, 551, 42, 258, 43, 102, 248, 340, 44, + 45, 396, 485, 586, 486, 487, 394, 395, 471, 569, + 580, 581, 567, 571, 570, 572, 565, 392, 466, 659, + 318, 222, 293, 109, 354, 46, 472, 83, 284, 428, + 637, 197, 319, 336, 321, 322, 323, 324, 325, 326, + 327, 328, 329, 337, 48, 297, 370, 444, 556, 445, + 446, 656, 473, 50, 296, 344, 404, 498, 499, 595, + 500, 474, 86, 208, 285, 209, 145, 146, 147, 148, + 52, 355, 430, 641, 356, 727, 748, 785, 357, 358, + 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, + 53, 87, 54, 177, 345, 504, 406, 505, 599, 503, + 597, 721, 596, 55, 88, 56, 268, 408, 676, 741, + 777, 824, 606, 802, 825, 803, 826, 867, 821, 804, + 827, 805, 823, 822, 856, 858, 866, 57, 58, 59, + 89, 286, 431, 643, 548, 644, 731, 549, 164, 341, + 493, 165, 257, 398, 166, 167, 342, 494, 168, 169, + 343, 495, 170, 359, 429, 639, 697, 640, 696, 749, + 475, 420, 529, 693, 746, 782, 421, 530, 694, 747, + 784, 476, 90, 287, 432, 645, 477, 666, 738, 775, + 820, 478, 578, 490, 582, 719, 757, 724, 742, 743, + 761, 780, 829, 762, 778, 828, 756, 773, 774, 795, + 818, 853, 796, 819, 854, 579, 797, 764, 781, 830, + 768, 783, 831, 812, 832, 861, 838, 855, 869, 874, + 875, 878, 479, 480, 63, 64, 65, 183, 347, 512, + 66, 220, 364, 290, 363, 409, 513, 614, 615, 616, + 617, 618, 612, 619, 514, 533, 515, 424, 535, 516, + 517, 518, 67, 185, 68, 105, 291, 437, 647, 732, + 771, 366, 436, 787, 276, 348, 523, 410, 524, 623, + 624, 525, 687, 744, 526, 688, 745, 69, 70, 71, + 72, 73, 279, 411, 625, 74, 75, 76, 188, 278, + 77, 280, 412, 626, 78, 241, 242, 303, 243, 789, + 816, 790, 79, 111, 294, 438, 648, 554, 555, 653, + 705, 519, 245, 390, 330, 80, 81, 112, 369, 193, + 283, 426, 352, 427, 539, 540, 538, 542 }; - /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If + /* YYTABLEYYPACT[STATE-NUM] -- What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule whose number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_int16 yytable[] = { - 108, 110, 159, 163, 92, 160, 161, 93, 204, 103, - 104, 162, 144, 205, 399, 198, 113, 320, 47, 51, - 60, 143, 49, 61, 419, 62, 226, 227, 691, 201, - 400, 401, 402, 244, 199, 202, 623, 203, 572, 200, - 349, 292, 299, 488, 106, 159, 163, 106, 160, 161, - 254, 255, 422, 294, 162, 797, 705, 520, 106, 296, - 529, 196, 206, 637, 143, 47, 51, 60, 706, 712, - 61, 625, 62, 626, 433, 207, -361, 210, 211, 212, - 213, 509, 798, 799, 106, 215, 91, 762, 572, 218, - 379, 423, 219, 106, 6, 221, -361, 440, 127, 128, - 129, 130, 131, 132, 133, 134, 135, 195, 137, 512, - 718, 8, 367, 12, -142, 140, 141, 795, 796, 122, - 565, 8, 107, 525, 807, 107, 435, 4, 304, 305, - 306, 307, 308, 309, 310, 311, 107, 174, 705, 312, - 313, -143, 174, 174, -313, 119, 122, 174, 513, 224, - 706, 224, 265, 174, 314, 315, 204, 106, 174, 316, - 317, 205, 224, 198, 18, 754, 413, 414, 95, 252, - 490, 107, 253, 488, -144, 797, 496, 201, 633, 122, - 441, 443, 199, 202, 223, 203, 225, 200, -100, 114, - 224, 106, 224, 122, 719, 259, 415, 260, 120, 551, - 106, 416, 798, 799, 18, 596, 128, 129, 99, 196, - 132, 133, 134, 135, 387, 388, 389, 174, 844, -331, - 12, 178, 495, 192, 643, 383, 384, 304, 305, 306, - 307, 308, 309, 310, 311, 107, 385, 386, 312, 313, - 122, 413, 414, 123, 861, 194, 572, 789, 790, 791, - 461, 462, 463, 314, 315, -453, 868, -525, 316, 317, - 405, 304, 305, 306, 307, 308, 309, 310, 311, 107, - 228, 415, 312, 313, 353, 229, 416, 230, 107, 417, - 418, 187, 246, 804, 174, 187, 376, 377, 378, -47, - 247, -47, 249, 317, 250, 204, 798, 799, 94, 96, - 205, 214, 198, 216, 251, -47, -47, 256, -47, -47, - 393, 224, -47, 491, 98, 101, 201, 393, 457, 458, - 261, 199, 202, 505, 203, 834, 200, 459, 460, 262, - 448, 263, 264, 320, -47, 572, -210, 267, -47, 266, - 269, 434, 270, 271, 543, 272, 545, 273, 196, 274, - 624, 275, -47, 277, 281, 282, 289, -526, 630, 288, - 106, 664, 300, 301, 159, 163, 331, 160, 161, 335, - 338, 339, 643, 162, 501, 350, 351, 572, 722, 560, - 346, 465, 360, 143, 361, 365, 442, 47, 51, 60, - 373, 49, 61, 530, 62, 534, 535, 374, 375, 380, - 382, 403, 530, 573, 381, 320, 397, 438, 574, 665, - -44, 450, 453, 532, 550, 464, 541, 542, 554, 405, - 556, 544, 702, 670, 671, 672, 557, 558, 559, 561, - 563, 580, 582, 588, 583, 555, 622, 598, 585, 586, - 413, 414, 587, 589, 594, 159, 163, 590, 160, 161, - 649, 599, -289, 573, 162, 501, 571, 600, 574, 601, - 608, 506, 507, 405, 143, 603, 617, 627, 628, 143, - 415, 508, 629, 631, 252, 416, -384, 654, 417, 418, - 641, 655, 656, 597, 604, 605, 606, 657, 658, 659, - 661, 662, 667, 711, 663, 673, 674, 675, 695, 676, - 677, 678, 679, 846, 847, 682, 571, 683, 615, 616, - 684, 701, 159, 163, 703, 160, 161, 685, 692, 693, - 694, 162, 715, 716, 726, 727, 728, 734, 737, 633, - 106, 143, 729, -402, 866, 127, 128, 129, 130, 131, - 132, 133, 134, 135, 136, 137, 138, 10, 11, 750, - 12, 139, 140, 141, 752, 467, 755, -393, 6, 756, - 757, 9, -393, -393, -393, -393, -393, -393, -393, -393, - -393, -393, -393, -393, 10, 11, 760, 12, 764, -393, - -393, 13, 766, 767, 413, 414, 468, 469, -393, -411, - 769, 776, 783, 838, 14, 785, 805, 788, 481, 482, - 483, 806, 808, 809, 813, 832, 815, 833, 107, 835, - 837, 573, 839, 848, 840, -101, 574, 22, 23, 862, - 122, 857, 858, 863, 869, 871, 870, 874, 875, 371, - 877, 710, 372, 173, 751, -393, 100, 97, 500, 545, - 106, 688, 456, 526, -86, 127, 128, 129, 130, 131, - 132, 133, 134, 135, 136, 137, 138, 10, 11, 455, - 12, 139, 140, 141, 571, 175, 713, 47, 51, 60, - 454, 648, 61, 584, 62, 666, 763, 92, 447, 106, - 721, 668, 731, 841, 127, 128, 129, 130, 131, 132, - 133, 134, 135, 195, 137, 138, 231, 407, 232, 581, - 573, 140, 141, 748, 548, 574, 843, 747, 860, 723, - 570, 845, 233, 234, 439, 235, 236, 189, 107, 237, - 850, 539, 730, 452, 174, 517, 652, 0, 0, 0, - 0, 0, 0, 92, 0, 0, 721, 0, 0, 842, - 0, 238, 573, 0, 0, 239, 0, 574, 0, 47, - 51, 60, 0, 571, 61, 0, 62, 107, 0, 240, - 0, 812, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 92, 0, 500, 811, 106, 0, 0, 0, - 0, 127, 128, 129, 130, 131, 132, 133, 134, 135, - 136, 137, 138, 10, 11, 571, 12, 139, 140, 141, - 0, 159, 163, 0, 160, 161, 393, 393, 0, 0, - 162, 855, 0, 0, 0, 0, 467, 0, -393, 6, - 143, 849, 9, -393, -393, -393, -393, -393, -393, -393, - -393, -393, -393, -393, -393, 10, 11, 393, 12, 0, - -393, -393, 13, 0, 0, 413, 414, 468, 469, -393, - 0, 0, 0, 0, 107, 14, 0, 0, 0, 481, - 482, 483, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 106, 0, 22, 23, - 0, 127, 128, 129, 130, 131, 132, 133, 134, 135, - 136, 137, 138, 0, 0, 0, -393, 139, 140, 141, - 467, 0, -393, 6, 0, -538, 9, -393, -393, -393, - -393, -393, -393, -393, -393, -393, -393, -393, -393, 10, - 11, 0, 12, 0, -393, -393, 13, 0, 0, 413, - 414, 468, 469, -393, 0, 0, 0, 0, 0, 14, - 0, 0, 0, 518, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 519, 107, 0, 0, 0, 0, 0, - 174, 0, 22, 23, 0, 0, 0, 0, 0, 0, + 108, 110, 163, 159, 92, 160, 161, 93, 47, 103, + 104, 162, 144, 204, 205, 399, 113, 49, 51, 60, + 61, 143, 422, 62, 198, 628, 419, 320, 201, 698, + 227, 292, 349, 423, 202, 203, 244, 199, 575, 400, + 401, 402, 299, 488, 200, 163, 159, 433, 160, 161, + 223, 8, 4, 106, 162, 47, 224, 522, 295, 799, + 91, 196, 206, 642, 143, 51, 60, 61, -144, -145, + 62, 119, 712, 122, 122, 207, 225, 210, 211, 212, + 213, 713, 224, 511, 8, 215, 800, 801, 106, 218, + 575, 630, 219, 631, 18, 221, 527, 120, 95, 106, + 379, 106, 367, 114, 127, 128, 129, 130, 131, 132, + 133, 134, 135, 195, 137, 138, 106, 531, 435, 174, + 568, 140, 141, 304, 305, 306, 307, 308, 309, 310, + 311, 107, -333, 106, 312, 313, 488, 174, 600, 128, + 129, 178, 174, 132, 133, 134, 135, 174, -315, 314, + 315, 712, 265, 12, 316, 317, 725, 259, -363, 260, + 713, 204, 205, 123, 192, -146, 107, 413, 414, 224, + 122, 224, 198, 174, 106, 488, 201, 107, -363, 107, + 491, 443, 202, 203, 511, 199, 497, 739, 726, 413, + 414, 553, 200, 638, 224, -100, 765, 415, 254, 255, + 122, 187, 416, 799, 122, 187, 18, 106, 776, 196, + 99, 107, 496, 383, 384, 252, 846, 174, 253, 415, + 194, 214, -455, 216, 416, 651, 798, 417, 418, 650, + 800, 801, -528, 809, 385, 386, 652, 387, 388, 389, + 228, -47, 863, -47, 304, 305, 306, 307, 308, 309, + 310, 311, 107, 575, 870, 312, 313, -47, -47, 226, + -47, -47, 229, 405, -47, 792, 793, 794, 800, 801, + 314, 315, 230, 806, 353, 316, 317, 304, 305, 306, + 307, 308, 309, 310, 311, 107, -47, 246, 312, 313, + -47, 461, 462, 463, 94, 96, 376, 377, 378, 247, + 204, 205, 98, 101, -47, 457, 458, 249, 250, 317, + 393, 198, 459, 460, 836, 201, 492, 393, 251, 651, + 224, 202, 203, 650, 199, 256, 506, 261, 289, 448, + 652, 200, 262, 263, 264, 231, -212, 232, 575, 267, + 266, 434, 629, 269, 106, 270, 320, 545, 196, 547, + 635, 233, 234, 271, 235, 236, 272, 274, 237, 273, + 275, 277, 281, 282, 163, 159, -529, 160, 161, 288, + 301, 335, 300, 162, 502, 671, 442, 47, 338, 575, + 238, 465, 563, 143, 239, 331, 49, 51, 60, 61, + 339, 350, 62, 532, 729, 536, 537, 346, 240, 351, + 360, 361, 532, 672, 368, 373, 365, 382, 576, 577, + 374, 489, 380, 375, 552, 397, -44, 677, 678, 679, + 320, 381, 403, 405, 510, 450, 453, 534, 464, 543, + 544, 546, 557, 559, 561, 558, 560, 562, 709, 566, + 583, 564, 593, 587, 589, 163, 159, 602, 160, 161, + 590, 603, 591, 594, 162, 502, 574, 604, 605, 592, + 576, 577, 598, -291, 143, 607, 106, 613, 405, 622, + 143, 127, 128, 129, 130, 131, 132, 133, 134, 135, + 195, 137, 138, 627, 601, 608, 609, 610, 140, 141, + -386, 413, 414, 632, 633, 634, 636, 573, 655, 646, + -567, 660, 661, 662, 663, 664, 848, 849, 574, 665, + 620, 621, 507, 508, 667, 163, 159, 668, 160, 161, + 669, 415, 509, 670, 162, 674, 416, 252, 680, 417, + 418, 681, 682, 683, 143, 684, 685, 868, 686, 689, + 106, 690, 706, 489, 107, 127, 128, 129, 130, 131, + 132, 133, 134, 135, 136, 137, 138, 10, 11, 700, + 12, 139, 140, 141, 691, 467, 692, -395, 6, 699, + 649, 9, -395, -395, -395, -395, -395, -395, -395, -395, + -395, -395, -395, -395, 10, 11, 701, 12, 702, -395, + -395, 13, 703, 707, 413, 414, 468, 469, -395, 708, + 710, 718, 638, 722, 14, 840, 723, -404, 481, 482, + 483, 733, 737, 740, 755, 760, 753, 758, 107, 759, + 763, 767, 770, 576, 577, -101, 769, 22, 23, 772, + 122, 413, 414, -413, 786, 779, 788, 717, 807, 791, + 808, 810, 815, 811, 837, -395, 817, 834, 835, 547, + 839, -213, 507, 508, -86, 842, 841, 850, 871, 873, + 864, 415, 509, 47, 859, 860, 416, 865, 879, 417, + 418, 574, 877, 51, 60, 61, 371, 872, 62, 876, + 372, 173, 754, 100, 92, 97, 585, 728, 528, 734, + 695, -458, 106, 6, 454, 175, 440, 127, 128, 129, + 130, 131, 132, 133, 134, 135, 195, 137, 576, 577, + 751, 106, 12, 455, 140, 141, 127, 128, 129, 130, + 131, 132, 133, 134, 135, 136, 137, 138, 10, 11, + 654, 12, 139, 140, 141, 456, 92, 720, 675, 728, + 673, 766, 47, 407, 844, 588, 447, 584, 843, 576, + 577, 845, 51, 60, 61, 550, 574, 62, 750, 730, + 862, 847, 439, 189, 814, 452, 541, 852, 611, 704, + 107, 425, 658, 0, 0, 92, 0, 0, 813, 441, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 107, + 0, 0, 0, 0, 0, 174, 0, 574, 0, 0, + 0, 0, 0, 163, 159, 0, 160, 161, 393, 393, + 0, 0, 162, 857, 0, 0, 0, 0, 467, 0, + -395, 6, 143, 851, 9, -395, -395, -395, -395, -395, + -395, -395, -395, -395, -395, -395, -395, 10, 11, 393, + 12, 0, -395, -395, 13, 0, 0, 413, 414, 468, + 469, -395, 0, 0, 0, 0, 0, 14, 0, 0, + 106, 481, 482, 483, 0, 127, 128, 129, 130, 131, + 132, 133, 134, 135, 195, 0, 0, 501, 0, 106, + 22, 23, 140, 141, 127, 128, 129, 130, 131, 132, + 133, 134, 135, 136, 137, 138, 10, 11, -395, 12, + 139, 140, 141, 467, -213, -395, 6, -541, 0, 9, + -395, -395, -395, -395, -395, -395, -395, -395, -395, -395, + -395, -395, 10, 11, 0, 12, 0, -395, -395, 13, + 0, 0, 413, 414, 468, 469, -395, 0, 107, 0, + 0, 0, 14, 0, 0, 0, 520, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 521, 107, 0, 0, + 0, 0, 0, 174, 0, 22, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - -393, 0, 0, 0, 467, 0, -393, 6, 0, -505, - 9, -393, -393, -393, -393, -393, -393, -393, -393, -393, - -393, -393, -393, 10, 11, 0, 12, 0, -393, -393, - 13, 0, 0, 413, 414, 468, 469, -393, 0, 467, - 0, -393, 6, 14, 0, 9, -393, -393, -393, -393, - -393, -393, -393, -393, -393, -393, -393, -393, 10, 11, - 0, 12, 0, -393, -393, 13, 22, 23, 413, 414, - 468, 469, -393, 0, 0, 0, 0, 0, 14, 0, - 0, 0, 0, 0, -393, 0, 0, 0, 0, 0, - -211, 0, 0, -68, 0, 0, 0, 0, 106, 0, - 0, 22, 23, 127, 128, 129, 130, 131, 132, 133, - 134, 135, 195, 137, 138, 0, 0, 0, 0, -393, - 140, 141, 0, 0, 467, -211, -393, 6, -90, 0, - 9, -393, -393, -393, -393, -393, -393, -393, -393, -393, - -393, -393, -393, 10, 11, 0, 12, 0, -393, -393, - 13, 0, 0, 413, 414, 468, 469, -393, 0, 0, - 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 5, 107, 0, 6, 7, - 8, 9, 0, 0, 0, 0, 22, 23, 0, 0, - 0, 0, 0, 0, 10, 11, 0, 12, 0, 0, - 0, 13, 0, 0, -393, 0, 0, 0, 0, 0, - -211, 0, 0, -529, 14, 15, 16, 17, 0, 0, - 0, 0, 0, 18, 19, 0, 0, 20, -2, 5, - 21, 0, 6, 7, 8, 9, 0, 22, 23, 0, - 0, 0, 0, 0, 24, 25, 704, 0, 10, 11, - 0, 12, 0, 0, 0, 13, 0, 0, 0, 0, - 26, 0, 0, 0, -53, 0, 0, 0, 14, 15, - 16, 17, 0, 0, 0, 0, 0, 18, 19, 0, - 0, 20, 5, 0, 21, 6, 7, 8, 9, 0, - 0, 22, 23, 0, 0, 0, 0, 0, 24, 25, - 0, 10, 11, 0, 12, 0, 0, 5, 13, 0, - 6, 7, 8, 9, 26, -211, 0, 0, 0, 0, - 0, 14, 15, 16, 17, 0, 10, 11, 0, 12, - 18, 19, 0, 13, 20, 0, 0, 21, 0, 0, - 0, 0, 0, 0, 22, 23, 14, 15, 16, 17, - 0, 24, 25, 0, 0, 18, 19, 0, 0, 20, - 5, 0, 21, 6, 7, 8, 9, 26, -211, 22, - 23, 0, 0, 0, 0, 0, 24, 25, 704, 10, - 11, 0, 12, 0, 0, 0, 13, 0, 0, 0, - 0, 0, 26, 0, 0, 0, 0, 0, 0, 14, - 15, 16, 17, 0, 0, 0, 0, 0, 18, 19, - 0, 0, 20, 0, 0, 21, 0, 0, 0, 0, - 0, 0, 22, 23, 0, 0, 106, 0, 0, 24, - 25, 127, 128, 129, 130, 131, 132, 133, 134, 135, - 136, 137, 138, 10, 11, 26, 12, 139, 140, 141, - 467, 0, -393, 6, 0, 0, 9, -393, -393, -393, - -393, -393, -393, -393, -393, -393, -393, -393, -393, 10, - 11, 0, 12, 0, -393, -393, 13, 0, 0, 413, - 414, 468, 469, -393, 0, 106, 0, 0, 0, 14, - 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, - 137, 138, 10, 11, 107, 12, 139, 140, 141, 106, - 174, 0, 22, 23, 127, 128, 129, 130, 131, 132, - 133, 134, 135, 195, 0, 0, 0, 0, 0, 0, - -393, 140, 141, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, -395, 0, 0, 0, 467, 0, -395, + 6, 0, -508, 9, -395, -395, -395, -395, -395, -395, + -395, -395, -395, -395, -395, -395, 10, 11, 0, 12, + 0, -395, -395, 13, 0, 0, 413, 414, 468, 469, + -395, 0, 467, 0, -395, 6, 14, 0, 9, -395, + -395, -395, -395, -395, -395, -395, -395, -395, -395, -395, + -395, 10, 11, 0, 12, 0, -395, -395, 13, 22, + 23, 413, 414, 468, 469, -395, 0, 0, 0, 0, + 0, 14, 0, 0, 0, 0, 0, -395, 0, 0, + 0, 0, 0, -213, 0, 0, -68, 0, 0, 0, + 0, 0, 106, 0, 22, 23, 0, 127, 128, 129, + 130, 131, 132, 133, 134, 135, 136, 137, 138, 0, + 0, 0, -395, 139, 140, 141, 0, 467, -213, -395, + 6, -90, 0, 9, -395, -395, -395, -395, -395, -395, + -395, -395, -395, -395, -395, -395, 10, 11, 0, 12, + 0, -395, -395, 13, 0, 0, 413, 414, 468, 469, + -395, 0, 0, 0, 0, 0, 14, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, + 107, 6, 7, 8, 9, 0, 174, 0, 0, 22, + 23, 0, 0, 0, 0, 0, 0, 10, 11, 0, + 12, 0, 0, 0, 13, 0, 0, -395, 0, 0, + 0, 0, 0, -213, 0, 0, -532, 14, 15, 16, + 17, 0, 0, 0, 0, 0, 18, 19, 0, 0, + 20, -2, 5, 21, 0, 6, 7, 8, 9, 0, + 22, 23, 0, 0, 0, 0, 0, 24, 25, 711, + 0, 10, 11, 0, 12, 0, 0, 0, 13, 0, + 0, 0, 0, 26, 0, 0, 0, -53, 0, 0, + 0, 14, 15, 16, 17, 0, 0, 0, 0, 0, + 18, 19, 0, 0, 20, 5, 0, 21, 6, 7, + 8, 9, 0, 0, 22, 23, 0, 0, 0, 0, + 0, 24, 25, 0, 10, 11, 0, 12, 0, 0, + 5, 13, 0, 6, 7, 8, 9, 26, -213, 0, + 0, 0, 0, 0, 14, 15, 16, 17, 0, 10, + 11, 0, 12, 18, 19, 0, 13, 20, 0, 0, + 21, 0, 0, 0, 0, 0, 0, 22, 23, 14, + 15, 16, 17, 0, 24, 25, 0, 0, 18, 19, + 0, 0, 20, 5, 0, 21, 6, 7, 8, 9, + 26, -213, 22, 23, 0, 0, 0, 0, 0, 24, + 25, 711, 10, 11, 0, 12, 0, 0, 0, 13, + 0, 0, 0, 0, 0, 26, 0, 0, 0, 0, + 0, 0, 14, 15, 16, 17, 0, 0, 0, 0, + 0, 18, 19, 0, 0, 20, 0, 0, 21, 0, + 0, 0, 0, 0, 0, 22, 23, 0, 0, 0, + 0, 0, 24, 25, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 467, 0, -395, 6, 0, 26, 9, + -395, -395, -395, -395, -395, -395, -395, -395, -395, -395, + -395, -395, 10, 11, 0, 12, 0, -395, -395, 13, + 0, 0, 413, 414, 468, 469, -395, 0, 0, 0, + 0, 0, 14, 0, 0, 0, 481, 482, 483, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 22, 23, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 467, 0, + -395, 6, 0, -395, 9, -395, -395, -395, -395, -395, + -395, -395, -395, -395, -395, -395, -395, 10, 11, 0, + 12, 0, -395, -395, 13, 0, 0, 413, 414, 468, + 469, -395, 501, 0, 106, 0, 0, 14, 0, 127, + 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, + 138, 10, 11, 0, 12, 139, 140, 141, 0, 106, + 22, 23, 0, 0, 127, 128, 129, 130, 131, 132, + 133, 134, 135, 136, 137, 138, 10, 11, -395, 12, + 139, 140, 141, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 107, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 107 }; static const yytype_int16 yycheck[] = { - 22, 23, 43, 43, 14, 43, 43, 14, 83, 19, - 20, 43, 43, 83, 339, 83, 26, 244, 2, 2, - 2, 43, 2, 2, 352, 2, 111, 112, 636, 83, - 341, 342, 343, 118, 83, 83, 528, 83, 478, 83, - 278, 222, 231, 396, 3, 86, 86, 3, 86, 86, - 8, 9, 352, 3, 86, 1, 651, 410, 3, 3, - 19, 83, 84, 3, 86, 49, 49, 49, 651, 3, - 49, 3, 49, 3, 362, 85, 87, 87, 88, 89, - 90, 409, 28, 29, 3, 95, 3, 742, 528, 99, - 317, 352, 102, 3, 4, 105, 107, 7, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 409, - 681, 6, 293, 23, 88, 25, 26, 772, 773, 93, - 473, 6, 81, 411, 779, 81, 364, 0, 73, 74, - 75, 76, 77, 78, 79, 80, 81, 87, 733, 84, - 85, 88, 87, 87, 90, 88, 93, 87, 409, 81, - 733, 81, 174, 87, 99, 100, 231, 3, 87, 104, - 105, 231, 81, 231, 49, 736, 30, 31, 53, 8, - 397, 81, 11, 526, 88, 1, 403, 231, 107, 93, - 90, 370, 231, 231, 75, 231, 75, 231, 88, 91, - 81, 3, 81, 93, 686, 92, 60, 94, 88, 437, - 3, 65, 28, 29, 49, 8, 9, 10, 53, 231, - 13, 14, 15, 16, 101, 102, 103, 87, 826, 88, - 23, 22, 403, 89, 552, 82, 83, 73, 74, 75, - 76, 77, 78, 79, 80, 81, 99, 100, 84, 85, - 93, 30, 31, 36, 852, 88, 686, 35, 36, 37, - 387, 388, 389, 99, 100, 88, 864, 88, 104, 105, - 345, 73, 74, 75, 76, 77, 78, 79, 80, 81, - 89, 60, 84, 85, 284, 89, 65, 88, 81, 68, - 69, 74, 88, 775, 87, 78, 314, 315, 316, 4, - 48, 6, 89, 105, 88, 370, 28, 29, 15, 16, - 370, 94, 370, 96, 89, 20, 21, 91, 23, 24, - 332, 81, 27, 398, 16, 17, 370, 339, 383, 384, - 91, 370, 370, 408, 370, 817, 370, 385, 386, 91, - 370, 88, 88, 560, 49, 775, 87, 89, 53, 88, - 88, 363, 88, 88, 429, 88, 431, 89, 370, 88, - 531, 89, 67, 88, 88, 88, 93, 88, 539, 89, - 3, 588, 91, 3, 405, 405, 92, 405, 405, 8, - 91, 47, 700, 405, 405, 89, 89, 817, 689, 464, - 105, 391, 89, 405, 89, 93, 370, 371, 371, 371, - 3, 371, 371, 415, 371, 417, 418, 92, 94, 96, - 98, 105, 424, 478, 97, 632, 94, 89, 478, 590, - 90, 92, 106, 58, 436, 94, 90, 95, 88, 504, - 88, 94, 649, 604, 605, 606, 90, 3, 89, 94, - 90, 90, 88, 95, 92, 445, 31, 505, 92, 92, - 30, 31, 92, 106, 90, 486, 486, 94, 486, 486, - 29, 505, 90, 528, 486, 486, 478, 505, 528, 505, - 90, 51, 52, 548, 486, 505, 90, 88, 88, 491, - 60, 61, 88, 88, 8, 65, 90, 88, 68, 69, - 90, 88, 88, 505, 506, 507, 508, 88, 88, 88, - 88, 88, 88, 3, 579, 88, 88, 88, 66, 88, - 88, 88, 88, 828, 829, 88, 528, 88, 518, 519, - 90, 88, 553, 553, 88, 553, 553, 90, 90, 94, - 90, 553, 106, 105, 88, 88, 88, 88, 88, 107, - 3, 553, 90, 35, 859, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 20, 21, 90, - 23, 24, 25, 26, 105, 1, 89, 3, 4, 106, - 35, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 20, 21, 38, 23, 55, 25, - 26, 27, 94, 108, 30, 31, 32, 33, 34, 106, - 91, 106, 59, 820, 40, 3, 94, 106, 44, 45, - 46, 105, 105, 62, 92, 94, 106, 94, 81, 39, - 88, 686, 93, 105, 90, 88, 686, 63, 64, 105, - 93, 106, 106, 93, 88, 75, 106, 106, 94, 298, - 75, 653, 298, 49, 733, 81, 17, 16, 1, 724, - 3, 632, 382, 412, 90, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 20, 21, 381, - 23, 24, 25, 26, 686, 50, 666, 651, 651, 651, - 380, 553, 651, 491, 651, 590, 743, 687, 370, 3, - 687, 593, 704, 823, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 4, 345, 6, 486, - 775, 25, 26, 725, 432, 775, 825, 724, 851, 690, - 34, 827, 20, 21, 369, 23, 24, 78, 81, 27, - 832, 424, 700, 375, 87, 409, 560, -1, -1, -1, - -1, -1, -1, 743, -1, -1, 743, -1, -1, 824, - -1, 49, 817, -1, -1, 53, -1, 817, -1, 733, - 733, 733, -1, 775, 733, -1, 733, 81, -1, 67, - -1, 783, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 782, -1, 1, 782, 3, -1, -1, -1, - -1, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, 817, 23, 24, 25, 26, - -1, 842, 842, -1, 842, 842, 828, 829, -1, -1, - 842, 842, -1, -1, -1, -1, 1, -1, 3, 4, - 842, 831, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 859, 23, -1, - 25, 26, 27, -1, -1, 30, 31, 32, 33, 34, - -1, -1, -1, -1, 81, 40, -1, -1, -1, 44, - 45, 46, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 3, -1, 63, 64, - -1, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, -1, -1, -1, 81, 24, 25, 26, - 1, -1, 3, 4, -1, 90, 7, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, -1, 23, -1, 25, 26, 27, -1, -1, 30, - 31, 32, 33, 34, -1, -1, -1, -1, -1, 40, - -1, -1, -1, 44, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 54, 81, -1, -1, -1, -1, -1, - 87, -1, 63, 64, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 81, -1, -1, -1, 1, -1, 3, 4, -1, 90, - 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, -1, 23, -1, 25, 26, - 27, -1, -1, 30, 31, 32, 33, 34, -1, 1, - -1, 3, 4, 40, -1, 7, 8, 9, 10, 11, + 22, 23, 43, 43, 14, 43, 43, 14, 2, 19, + 20, 43, 43, 83, 83, 339, 26, 2, 2, 2, + 2, 43, 352, 2, 83, 530, 352, 244, 83, 641, + 112, 222, 278, 352, 83, 83, 118, 83, 478, 341, + 342, 343, 231, 396, 83, 86, 86, 362, 86, 86, + 75, 6, 0, 3, 86, 49, 81, 410, 3, 1, + 3, 83, 84, 3, 86, 49, 49, 49, 88, 88, + 49, 88, 657, 93, 93, 85, 75, 87, 88, 89, + 90, 657, 81, 409, 6, 95, 28, 29, 3, 99, + 530, 3, 102, 3, 49, 105, 411, 88, 53, 3, + 317, 3, 293, 91, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 3, 19, 364, 87, + 473, 25, 26, 73, 74, 75, 76, 77, 78, 79, + 80, 81, 88, 3, 84, 85, 489, 87, 8, 9, + 10, 22, 87, 13, 14, 15, 16, 87, 90, 99, + 100, 736, 174, 23, 104, 105, 688, 92, 87, 94, + 736, 231, 231, 36, 89, 88, 81, 30, 31, 81, + 93, 81, 231, 87, 3, 528, 231, 81, 107, 81, + 397, 370, 231, 231, 510, 231, 403, 719, 693, 30, + 31, 437, 231, 107, 81, 88, 745, 60, 8, 9, + 93, 74, 65, 1, 93, 78, 49, 3, 757, 231, + 53, 81, 403, 82, 83, 8, 828, 87, 11, 60, + 88, 94, 88, 96, 65, 555, 775, 68, 69, 555, + 28, 29, 88, 782, 99, 100, 555, 101, 102, 103, + 89, 4, 854, 6, 73, 74, 75, 76, 77, 78, + 79, 80, 81, 693, 866, 84, 85, 20, 21, 3, + 23, 24, 89, 345, 27, 35, 36, 37, 28, 29, + 99, 100, 88, 778, 284, 104, 105, 73, 74, 75, + 76, 77, 78, 79, 80, 81, 49, 88, 84, 85, + 53, 387, 388, 389, 15, 16, 314, 315, 316, 48, + 370, 370, 16, 17, 67, 383, 384, 89, 88, 105, + 332, 370, 385, 386, 819, 370, 398, 339, 89, 649, + 81, 370, 370, 649, 370, 91, 408, 91, 93, 370, + 649, 370, 91, 88, 88, 4, 87, 6, 778, 89, + 88, 363, 533, 88, 3, 88, 563, 429, 370, 431, + 541, 20, 21, 88, 23, 24, 88, 88, 27, 89, + 89, 88, 88, 88, 405, 405, 88, 405, 405, 89, + 3, 8, 91, 405, 405, 592, 370, 371, 91, 819, + 49, 391, 464, 405, 53, 92, 371, 371, 371, 371, + 47, 89, 371, 415, 696, 417, 418, 105, 67, 89, + 89, 89, 424, 594, 89, 3, 93, 98, 478, 478, + 92, 396, 96, 94, 436, 94, 90, 608, 609, 610, + 637, 97, 105, 505, 409, 92, 106, 58, 94, 90, + 95, 94, 88, 88, 3, 445, 90, 89, 655, 90, + 90, 94, 106, 92, 92, 486, 486, 506, 486, 486, + 92, 506, 92, 94, 486, 486, 478, 506, 506, 95, + 530, 530, 90, 90, 486, 506, 3, 90, 550, 90, + 492, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 17, 18, 19, 31, 506, 507, 508, 509, 25, 26, + 90, 30, 31, 88, 88, 88, 88, 34, 29, 90, + 90, 88, 88, 88, 88, 88, 830, 831, 530, 88, + 520, 521, 51, 52, 88, 556, 556, 88, 556, 556, + 3, 60, 61, 88, 556, 88, 65, 8, 88, 68, + 69, 88, 88, 88, 556, 88, 88, 861, 88, 88, + 3, 88, 88, 528, 81, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 20, 21, 94, + 23, 24, 25, 26, 90, 1, 90, 3, 4, 90, + 555, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 90, 23, 66, 25, + 26, 27, 90, 88, 30, 31, 32, 33, 34, 88, + 88, 3, 107, 106, 40, 822, 105, 35, 44, 45, + 46, 88, 88, 88, 105, 35, 90, 89, 81, 106, + 38, 55, 108, 693, 693, 88, 94, 63, 64, 91, + 93, 30, 31, 106, 59, 106, 3, 659, 94, 106, + 105, 105, 92, 62, 39, 81, 106, 94, 94, 731, + 88, 87, 51, 52, 90, 90, 93, 105, 88, 75, + 105, 60, 61, 657, 106, 106, 65, 93, 75, 68, + 69, 693, 94, 657, 657, 657, 298, 106, 657, 106, + 298, 49, 736, 17, 694, 16, 489, 694, 412, 711, + 637, 90, 3, 4, 380, 50, 7, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 778, 778, + 732, 3, 23, 381, 25, 26, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, - -1, 23, -1, 25, 26, 27, 63, 64, 30, 31, - 32, 33, 34, -1, -1, -1, -1, -1, 40, -1, - -1, -1, -1, -1, 81, -1, -1, -1, -1, -1, - 87, -1, -1, 90, -1, -1, -1, -1, 3, -1, - -1, 63, 64, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, -1, -1, -1, -1, 81, - 25, 26, -1, -1, 1, 87, 3, 4, 90, -1, - 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, -1, 23, -1, 25, 26, - 27, -1, -1, 30, 31, 32, 33, 34, -1, -1, - -1, -1, -1, 40, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 1, 81, -1, 4, 5, - 6, 7, -1, -1, -1, -1, 63, 64, -1, -1, - -1, -1, -1, -1, 20, 21, -1, 23, -1, -1, - -1, 27, -1, -1, 81, -1, -1, -1, -1, -1, - 87, -1, -1, 90, 40, 41, 42, 43, -1, -1, - -1, -1, -1, 49, 50, -1, -1, 53, 0, 1, - 56, -1, 4, 5, 6, 7, -1, 63, 64, -1, - -1, -1, -1, -1, 70, 71, 72, -1, 20, 21, - -1, 23, -1, -1, -1, 27, -1, -1, -1, -1, - 86, -1, -1, -1, 90, -1, -1, -1, 40, 41, - 42, 43, -1, -1, -1, -1, -1, 49, 50, -1, - -1, 53, 1, -1, 56, 4, 5, 6, 7, -1, - -1, 63, 64, -1, -1, -1, -1, -1, 70, 71, - -1, 20, 21, -1, 23, -1, -1, 1, 27, -1, - 4, 5, 6, 7, 86, 87, -1, -1, -1, -1, - -1, 40, 41, 42, 43, -1, 20, 21, -1, 23, - 49, 50, -1, 27, 53, -1, -1, 56, -1, -1, - -1, -1, -1, -1, 63, 64, 40, 41, 42, 43, - -1, 70, 71, -1, -1, 49, 50, -1, -1, 53, - 1, -1, 56, 4, 5, 6, 7, 86, 87, 63, - 64, -1, -1, -1, -1, -1, 70, 71, 72, 20, - 21, -1, 23, -1, -1, -1, 27, -1, -1, -1, - -1, -1, 86, -1, -1, -1, -1, -1, -1, 40, - 41, 42, 43, -1, -1, -1, -1, -1, 49, 50, - -1, -1, 53, -1, -1, 56, -1, -1, -1, -1, - -1, -1, 63, 64, -1, -1, 3, -1, -1, 70, - 71, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, 86, 23, 24, 25, 26, - 1, -1, 3, 4, -1, -1, 7, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, -1, 23, -1, 25, 26, 27, -1, -1, 30, - 31, 32, 33, 34, -1, 3, -1, -1, -1, 40, + 556, 23, 24, 25, 26, 382, 746, 673, 597, 746, + 594, 746, 736, 345, 826, 492, 370, 486, 825, 819, + 819, 827, 736, 736, 736, 432, 778, 736, 731, 697, + 853, 829, 369, 78, 786, 375, 424, 834, 510, 649, + 81, 352, 563, -1, -1, 785, -1, -1, 785, 90, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 81, + -1, -1, -1, -1, -1, 87, -1, 819, -1, -1, + -1, -1, -1, 844, 844, -1, 844, 844, 830, 831, + -1, -1, 844, 844, -1, -1, -1, -1, 1, -1, + 3, 4, 844, 833, 7, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 20, 21, 861, + 23, -1, 25, 26, 27, -1, -1, 30, 31, 32, + 33, 34, -1, -1, -1, -1, -1, 40, -1, -1, + 3, 44, 45, 46, -1, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 17, -1, -1, 1, -1, 3, + 63, 64, 25, 26, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 20, 21, 81, 23, + 24, 25, 26, 1, 87, 3, 4, 90, -1, 7, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, -1, 23, -1, 25, 26, 27, + -1, -1, 30, 31, 32, 33, 34, -1, 81, -1, + -1, -1, 40, -1, -1, -1, 44, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 54, 81, -1, -1, + -1, -1, -1, 87, -1, 63, 64, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 81, -1, -1, -1, 1, -1, 3, + 4, -1, 90, 7, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 20, 21, -1, 23, + -1, 25, 26, 27, -1, -1, 30, 31, 32, 33, + 34, -1, 1, -1, 3, 4, 40, -1, 7, 8, + 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + 19, 20, 21, -1, 23, -1, 25, 26, 27, 63, + 64, 30, 31, 32, 33, 34, -1, -1, -1, -1, + -1, 40, -1, -1, -1, -1, -1, 81, -1, -1, + -1, -1, -1, 87, -1, -1, 90, -1, -1, -1, + -1, -1, 3, -1, 63, 64, -1, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, -1, + -1, -1, 81, 24, 25, 26, -1, 1, 87, 3, + 4, 90, -1, 7, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 20, 21, -1, 23, + -1, 25, 26, 27, -1, -1, 30, 31, 32, 33, + 34, -1, -1, -1, -1, -1, 40, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, + 81, 4, 5, 6, 7, -1, 87, -1, -1, 63, + 64, -1, -1, -1, -1, -1, -1, 20, 21, -1, + 23, -1, -1, -1, 27, -1, -1, 81, -1, -1, + -1, -1, -1, 87, -1, -1, 90, 40, 41, 42, + 43, -1, -1, -1, -1, -1, 49, 50, -1, -1, + 53, 0, 1, 56, -1, 4, 5, 6, 7, -1, + 63, 64, -1, -1, -1, -1, -1, 70, 71, 72, + -1, 20, 21, -1, 23, -1, -1, -1, 27, -1, + -1, -1, -1, 86, -1, -1, -1, 90, -1, -1, + -1, 40, 41, 42, 43, -1, -1, -1, -1, -1, + 49, 50, -1, -1, 53, 1, -1, 56, 4, 5, + 6, 7, -1, -1, 63, 64, -1, -1, -1, -1, + -1, 70, 71, -1, 20, 21, -1, 23, -1, -1, + 1, 27, -1, 4, 5, 6, 7, 86, 87, -1, + -1, -1, -1, -1, 40, 41, 42, 43, -1, 20, + 21, -1, 23, 49, 50, -1, 27, 53, -1, -1, + 56, -1, -1, -1, -1, -1, -1, 63, 64, 40, + 41, 42, 43, -1, 70, 71, -1, -1, 49, 50, + -1, -1, 53, 1, -1, 56, 4, 5, 6, 7, + 86, 87, 63, 64, -1, -1, -1, -1, -1, 70, + 71, 72, 20, 21, -1, 23, -1, -1, -1, 27, + -1, -1, -1, -1, -1, 86, -1, -1, -1, -1, + -1, -1, 40, 41, 42, 43, -1, -1, -1, -1, + -1, 49, 50, -1, -1, 53, -1, -1, 56, -1, + -1, -1, -1, -1, -1, 63, 64, -1, -1, -1, + -1, -1, 70, 71, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 1, -1, 3, 4, -1, 86, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - 18, 19, 20, 21, 81, 23, 24, 25, 26, 3, - 87, -1, 63, 64, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, -1, -1, -1, -1, -1, -1, - 81, 25, 26, -1, -1, -1, -1, -1, -1, -1, + 18, 19, 20, 21, -1, 23, -1, 25, 26, 27, + -1, -1, 30, 31, 32, 33, 34, -1, -1, -1, + -1, -1, 40, -1, -1, -1, 44, 45, 46, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 63, 64, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, + 3, 4, -1, 81, 7, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 20, 21, -1, + 23, -1, 25, 26, 27, -1, -1, 30, 31, 32, + 33, 34, 1, -1, 3, -1, -1, 40, -1, 8, + 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + 19, 20, 21, -1, 23, 24, 25, 26, -1, 3, + 63, 64, -1, -1, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 20, 21, 81, 23, + 24, 25, 26, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 81, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 81, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 81 }; - /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing + /* YYSTOSSTATE-NUM -- The (internal number of the) accessing symbol of state STATE-NUM. */ -static const yytype_uint16 yystos[] = +static const yytype_int16 yystos[] = { 0, 110, 111, 112, 0, 1, 4, 5, 6, 7, 20, 21, 23, 27, 40, 41, 42, 43, 49, 50, 53, 56, 63, 64, 70, 71, 86, 113, 114, 130, 132, 136, 137, 149, 152, 153, 157, 159, 162, 163, - 164, 168, 172, 174, 178, 179, 203, 204, 222, 230, - 231, 239, 248, 268, 270, 281, 283, 305, 306, 307, - 349, 400, 401, 402, 403, 404, 408, 430, 432, 455, - 456, 457, 458, 459, 463, 464, 465, 468, 472, 480, - 495, 496, 129, 205, 131, 158, 240, 269, 282, 308, - 350, 3, 202, 256, 157, 53, 157, 172, 174, 53, - 164, 174, 175, 202, 202, 433, 3, 81, 198, 201, - 198, 481, 497, 202, 91, 133, 122, 138, 150, 88, + 164, 168, 172, 174, 178, 179, 204, 205, 223, 231, + 232, 240, 249, 269, 271, 282, 284, 306, 307, 308, + 350, 401, 402, 403, 404, 405, 409, 431, 433, 456, + 457, 458, 459, 460, 464, 465, 466, 469, 473, 481, + 494, 495, 129, 206, 131, 158, 241, 270, 283, 309, + 351, 3, 203, 257, 157, 53, 157, 172, 174, 53, + 164, 174, 175, 203, 203, 434, 3, 81, 199, 202, + 199, 482, 496, 203, 91, 133, 122, 138, 150, 88, 88, 121, 93, 160, 154, 123, 165, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 24, - 25, 26, 160, 198, 243, 244, 245, 246, 247, 258, - 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, - 270, 281, 283, 307, 316, 319, 322, 323, 326, 327, - 330, 119, 115, 113, 87, 232, 116, 271, 22, 120, - 117, 118, 124, 405, 125, 431, 126, 160, 466, 466, - 127, 128, 89, 499, 88, 17, 198, 209, 258, 261, - 262, 263, 264, 265, 323, 327, 198, 202, 241, 243, - 202, 202, 202, 202, 160, 202, 160, 169, 202, 202, - 409, 202, 199, 75, 81, 75, 231, 231, 89, 89, + 25, 26, 160, 199, 244, 245, 246, 247, 248, 259, + 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, + 271, 282, 284, 308, 317, 320, 323, 324, 327, 328, + 331, 119, 115, 113, 87, 233, 116, 272, 22, 120, + 117, 118, 124, 406, 125, 432, 126, 160, 467, 467, + 127, 128, 89, 498, 88, 17, 199, 210, 259, 262, + 263, 264, 265, 266, 324, 328, 199, 203, 242, 244, + 203, 203, 203, 203, 160, 203, 160, 169, 203, 203, + 410, 203, 200, 75, 81, 75, 3, 232, 89, 89, 88, 4, 6, 20, 21, 23, 24, 27, 49, 53, - 67, 473, 474, 476, 231, 492, 88, 48, 176, 89, - 88, 89, 8, 11, 8, 9, 91, 320, 173, 92, - 94, 91, 91, 88, 88, 198, 88, 89, 284, 88, - 88, 88, 88, 89, 88, 89, 442, 88, 467, 460, - 469, 88, 88, 500, 206, 242, 309, 351, 89, 93, - 411, 434, 201, 200, 3, 232, 3, 223, 134, 209, - 91, 3, 139, 475, 73, 74, 75, 76, 77, 78, - 79, 80, 84, 85, 99, 100, 104, 105, 198, 210, - 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, - 494, 92, 161, 155, 166, 8, 211, 221, 91, 47, - 177, 317, 324, 328, 233, 272, 105, 406, 443, 177, - 89, 89, 502, 202, 202, 249, 252, 256, 257, 331, - 89, 89, 170, 412, 410, 93, 439, 201, 482, 498, - 224, 111, 112, 3, 92, 94, 219, 219, 219, 211, + 67, 474, 475, 477, 232, 491, 88, 48, 176, 89, + 88, 89, 8, 11, 8, 9, 91, 321, 173, 92, + 94, 91, 91, 88, 88, 199, 88, 89, 285, 88, + 88, 88, 88, 89, 88, 89, 443, 88, 468, 461, + 470, 88, 88, 499, 207, 243, 310, 352, 89, 93, + 412, 435, 202, 201, 483, 3, 233, 224, 134, 210, + 91, 3, 139, 476, 73, 74, 75, 76, 77, 78, + 79, 80, 84, 85, 99, 100, 104, 105, 199, 211, + 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, + 493, 92, 161, 155, 166, 8, 212, 222, 91, 47, + 177, 318, 325, 329, 234, 273, 105, 407, 444, 177, + 89, 89, 501, 203, 203, 250, 253, 257, 258, 332, + 89, 89, 170, 413, 411, 93, 440, 202, 89, 497, + 225, 111, 112, 3, 92, 94, 220, 220, 220, 212, 96, 97, 98, 82, 83, 99, 100, 101, 102, 103, - 493, 151, 195, 198, 184, 185, 180, 94, 321, 195, - 221, 221, 221, 105, 234, 231, 274, 276, 285, 413, - 445, 461, 470, 30, 31, 60, 65, 68, 69, 338, - 339, 344, 422, 424, 425, 491, 501, 503, 207, 332, - 250, 310, 352, 184, 198, 177, 440, 435, 89, 411, - 7, 90, 204, 209, 225, 227, 228, 266, 307, 135, - 92, 140, 476, 106, 213, 214, 215, 216, 216, 217, - 217, 218, 218, 218, 94, 202, 196, 1, 32, 33, - 156, 186, 204, 230, 239, 338, 349, 354, 359, 400, - 401, 44, 45, 46, 167, 181, 182, 183, 186, 361, - 211, 231, 318, 325, 329, 201, 211, 235, 236, 238, - 1, 243, 277, 273, 275, 231, 51, 52, 61, 338, - 407, 414, 422, 424, 427, 428, 429, 491, 44, 54, - 186, 444, 446, 449, 452, 184, 180, 340, 345, 19, - 198, 423, 58, 426, 198, 198, 506, 504, 505, 423, - 507, 90, 95, 231, 94, 231, 312, 315, 275, 171, - 198, 177, 483, 226, 88, 202, 88, 90, 3, 89, - 231, 94, 194, 90, 190, 186, 187, 192, 191, 193, - 34, 198, 245, 323, 327, 360, 383, 188, 189, 362, - 90, 277, 88, 92, 244, 92, 92, 92, 95, 106, - 94, 237, 280, 278, 90, 276, 8, 198, 258, 263, - 264, 265, 290, 307, 198, 198, 198, 420, 90, 415, - 416, 417, 418, 419, 421, 202, 202, 90, 447, 448, - 462, 471, 31, 383, 201, 3, 3, 88, 88, 88, - 201, 88, 208, 107, 333, 335, 251, 3, 311, 313, - 353, 90, 436, 338, 422, 424, 485, 487, 241, 29, - 229, 141, 494, 197, 88, 88, 88, 88, 88, 88, - 355, 88, 88, 231, 211, 201, 238, 88, 249, 286, - 201, 201, 201, 88, 88, 88, 88, 88, 88, 88, - 450, 453, 88, 88, 90, 90, 341, 346, 210, 336, - 334, 252, 90, 94, 90, 66, 490, 488, 489, 484, - 486, 88, 211, 88, 72, 114, 130, 143, 145, 146, - 198, 3, 3, 237, 279, 106, 105, 365, 365, 383, - 253, 256, 221, 335, 314, 437, 88, 88, 88, 90, - 487, 198, 142, 144, 88, 356, 363, 88, 287, 366, - 367, 451, 454, 342, 347, 254, 337, 315, 198, 147, - 90, 145, 105, 374, 365, 89, 106, 35, 368, 371, - 38, 385, 385, 253, 55, 388, 94, 108, 438, 91, - 375, 376, 357, 364, 288, 372, 106, 369, 386, 343, - 389, 348, 255, 59, 441, 3, 477, 479, 106, 35, - 36, 37, 377, 380, 384, 385, 385, 1, 28, 29, - 291, 293, 297, 299, 383, 94, 105, 385, 105, 62, - 391, 256, 198, 92, 478, 106, 378, 381, 358, 296, - 301, 300, 289, 292, 294, 298, 373, 370, 387, 390, - 392, 148, 94, 94, 383, 39, 394, 88, 211, 93, - 90, 293, 231, 299, 252, 371, 195, 195, 105, 202, - 479, 379, 382, 395, 302, 243, 303, 106, 106, 393, - 380, 252, 105, 93, 304, 295, 195, 396, 252, 88, - 106, 75, 397, 398, 106, 94, 399, 75 + 492, 151, 196, 199, 185, 186, 180, 94, 322, 196, + 222, 222, 222, 105, 235, 232, 275, 277, 286, 414, + 446, 462, 471, 30, 31, 60, 65, 68, 69, 339, + 340, 345, 423, 425, 426, 490, 500, 502, 208, 333, + 251, 311, 353, 185, 199, 177, 441, 436, 484, 412, + 7, 90, 205, 210, 226, 228, 229, 267, 308, 135, + 92, 140, 477, 106, 214, 215, 216, 217, 217, 218, + 218, 219, 219, 219, 94, 203, 197, 1, 32, 33, + 156, 187, 205, 231, 240, 339, 350, 355, 360, 401, + 402, 44, 45, 46, 167, 181, 183, 184, 187, 231, + 362, 212, 232, 319, 326, 330, 202, 212, 236, 237, + 239, 1, 244, 278, 274, 276, 232, 51, 52, 61, + 231, 339, 408, 415, 423, 425, 428, 429, 430, 490, + 44, 54, 187, 445, 447, 450, 453, 185, 180, 341, + 346, 19, 199, 424, 58, 427, 199, 199, 505, 503, + 504, 424, 506, 90, 95, 232, 94, 232, 313, 316, + 276, 171, 199, 177, 486, 487, 227, 88, 203, 88, + 90, 3, 89, 232, 94, 195, 90, 191, 187, 188, + 193, 192, 194, 34, 199, 246, 324, 328, 361, 384, + 189, 190, 363, 90, 278, 181, 182, 92, 245, 92, + 92, 92, 95, 106, 94, 238, 281, 279, 90, 277, + 8, 199, 259, 264, 265, 266, 291, 308, 199, 199, + 199, 415, 421, 90, 416, 417, 418, 419, 420, 422, + 203, 203, 90, 448, 449, 463, 472, 31, 384, 202, + 3, 3, 88, 88, 88, 202, 88, 209, 107, 334, + 336, 252, 3, 312, 314, 354, 90, 437, 485, 231, + 339, 423, 425, 488, 242, 29, 230, 141, 493, 198, + 88, 88, 88, 88, 88, 88, 356, 88, 88, 3, + 88, 212, 202, 239, 88, 250, 287, 202, 202, 202, + 88, 88, 88, 88, 88, 88, 88, 451, 454, 88, + 88, 90, 90, 342, 347, 211, 337, 335, 253, 90, + 94, 90, 66, 90, 488, 489, 88, 88, 88, 212, + 88, 72, 114, 130, 143, 145, 146, 199, 3, 364, + 238, 280, 106, 105, 366, 366, 384, 254, 257, 222, + 336, 315, 438, 88, 199, 142, 144, 88, 357, 366, + 88, 288, 367, 368, 452, 455, 343, 348, 255, 338, + 316, 199, 147, 90, 145, 105, 375, 365, 89, 106, + 35, 369, 372, 38, 386, 386, 254, 55, 389, 94, + 108, 439, 91, 376, 377, 358, 386, 289, 373, 106, + 370, 387, 344, 390, 349, 256, 59, 442, 3, 478, + 480, 106, 35, 36, 37, 378, 381, 385, 386, 1, + 28, 29, 292, 294, 298, 300, 384, 94, 105, 386, + 105, 62, 392, 257, 199, 92, 479, 106, 379, 382, + 359, 297, 302, 301, 290, 293, 295, 299, 374, 371, + 388, 391, 393, 148, 94, 94, 384, 39, 395, 88, + 212, 93, 90, 294, 232, 300, 253, 372, 196, 196, + 105, 203, 480, 380, 383, 396, 303, 244, 304, 106, + 106, 394, 381, 253, 105, 93, 305, 296, 196, 397, + 253, 88, 106, 75, 398, 399, 106, 94, 400, 75 }; - /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const yytype_uint16 yyr1[] = + /* YYR1YYN -- Symbol number of symbol that rule YYN derives. */ +static const yytype_int16 yyr1[] = { 0, 109, 110, 111, 111, 112, 112, 113, 113, 113, 115, 114, 116, 114, 117, 114, 118, 114, 119, 114, @@ -1568,60 +2188,60 @@ static const yytype_uint16 yyr1[] = 158, 157, 159, 159, 159, 161, 160, 160, 162, 162, 162, 162, 163, 163, 165, 166, 167, 164, 169, 170, 171, 168, 173, 172, 175, 174, 176, 176, 177, 177, - 178, 178, 179, 180, 180, 181, 181, 181, 182, 182, - 183, 184, 184, 185, 185, 187, 186, 188, 186, 189, - 186, 190, 186, 191, 186, 192, 186, 193, 186, 194, - 186, 195, 197, 196, 196, 198, 199, 198, 200, 198, - 201, 202, 203, 203, 203, 205, 206, 207, 208, 204, - 209, 209, 209, 209, 209, 209, 209, 209, 209, 210, - 211, 212, 212, 213, 213, 214, 214, 215, 215, 215, - 216, 216, 216, 217, 217, 217, 217, 218, 218, 218, - 218, 219, 219, 219, 220, 220, 220, 220, 220, 220, - 220, 220, 220, 220, 221, 223, 222, 224, 224, 225, - 225, 225, 226, 225, 227, 227, 228, 229, 229, 230, - 231, 231, 233, 232, 234, 234, 235, 235, 236, 237, - 237, 238, 240, 239, 239, 239, 239, 239, 239, 242, - 241, 243, 243, 244, 244, 244, 245, 245, 245, 245, - 245, 245, 245, 245, 246, 246, 246, 246, 247, 247, - 247, 248, 248, 249, 251, 250, 250, 252, 252, 253, - 255, 254, 254, 256, 257, 258, 258, 259, 259, 259, - 260, 260, 260, 261, 261, 261, 262, 263, 263, 264, - 265, 266, 267, 269, 268, 271, 272, 273, 270, 274, - 275, 275, 276, 278, 279, 277, 280, 277, 282, 281, - 284, 285, 286, 287, 288, 289, 283, 290, 290, 290, - 290, 290, 290, 291, 292, 292, 294, 295, 293, 296, - 293, 297, 298, 298, 300, 299, 301, 302, 299, 304, - 303, 305, 306, 308, 309, 310, 311, 307, 312, 314, - 313, 313, 315, 317, 318, 316, 316, 320, 321, 319, - 322, 324, 325, 323, 323, 326, 328, 329, 327, 327, - 330, 332, 331, 333, 334, 334, 336, 337, 335, 338, - 338, 340, 341, 342, 343, 339, 345, 346, 347, 348, - 344, 350, 351, 352, 353, 349, 355, 356, 357, 358, - 354, 359, 359, 359, 360, 360, 362, 363, 364, 361, - 366, 365, 367, 365, 368, 370, 369, 369, 372, 373, - 371, 375, 374, 376, 374, 377, 379, 378, 378, 381, - 382, 380, 383, 383, 383, 383, 384, 384, 384, 386, - 387, 385, 385, 389, 390, 388, 388, 392, 393, 391, - 391, 395, 396, 394, 394, 397, 399, 398, 398, 400, - 401, 402, 402, 403, 405, 406, 407, 404, 409, 410, - 408, 412, 411, 411, 413, 413, 415, 414, 416, 414, - 417, 414, 418, 414, 419, 414, 420, 414, 421, 414, - 422, 423, 423, 424, 425, 426, 426, 427, 428, 429, - 431, 430, 433, 434, 435, 436, 437, 438, 432, 440, - 439, 439, 441, 441, 443, 444, 442, 445, 445, 446, - 447, 446, 448, 446, 450, 451, 449, 453, 454, 452, - 455, 455, 455, 456, 456, 457, 458, 460, 461, 462, - 459, 463, 464, 465, 467, 466, 469, 470, 471, 468, - 472, 472, 473, 473, 473, 473, 473, 473, 473, 473, - 473, 473, 474, 475, 475, 476, 476, 477, 478, 478, - 479, 481, 482, 483, 484, 480, 485, 486, 486, 488, - 487, 489, 487, 490, 487, 491, 491, 492, 493, 493, - 494, 495, 497, 498, 496, 500, 501, 499, 502, 502, - 504, 503, 505, 503, 506, 503, 507, 503 + 178, 178, 179, 180, 180, 180, 181, 181, 182, 181, + 183, 183, 184, 185, 185, 186, 186, 188, 187, 189, + 187, 190, 187, 191, 187, 192, 187, 193, 187, 194, + 187, 195, 187, 196, 198, 197, 197, 199, 200, 199, + 201, 199, 202, 203, 204, 204, 204, 206, 207, 208, + 209, 205, 210, 210, 210, 210, 210, 210, 210, 210, + 210, 211, 212, 213, 213, 214, 214, 215, 215, 216, + 216, 216, 217, 217, 217, 218, 218, 218, 218, 219, + 219, 219, 219, 220, 220, 220, 221, 221, 221, 221, + 221, 221, 221, 221, 221, 221, 222, 224, 223, 225, + 225, 226, 226, 226, 227, 226, 228, 228, 229, 230, + 230, 231, 232, 232, 234, 233, 235, 235, 236, 236, + 237, 238, 238, 239, 241, 240, 240, 240, 240, 240, + 240, 243, 242, 244, 244, 245, 245, 245, 246, 246, + 246, 246, 246, 246, 246, 246, 247, 247, 247, 247, + 248, 248, 248, 249, 249, 250, 252, 251, 251, 253, + 253, 254, 256, 255, 255, 257, 258, 259, 259, 260, + 260, 260, 261, 261, 261, 262, 262, 262, 263, 264, + 264, 265, 266, 267, 268, 270, 269, 272, 273, 274, + 271, 275, 276, 276, 277, 279, 280, 278, 281, 278, + 283, 282, 285, 286, 287, 288, 289, 290, 284, 291, + 291, 291, 291, 291, 291, 292, 293, 293, 295, 296, + 294, 297, 294, 298, 299, 299, 301, 300, 302, 303, + 300, 305, 304, 306, 307, 309, 310, 311, 312, 308, + 313, 315, 314, 314, 316, 318, 319, 317, 317, 321, + 322, 320, 323, 325, 326, 324, 324, 327, 329, 330, + 328, 328, 331, 333, 332, 334, 335, 335, 337, 338, + 336, 339, 339, 341, 342, 343, 344, 340, 346, 347, + 348, 349, 345, 351, 352, 353, 354, 350, 356, 357, + 358, 359, 355, 360, 360, 360, 361, 361, 363, 364, + 365, 362, 367, 366, 368, 366, 369, 371, 370, 370, + 373, 374, 372, 376, 375, 377, 375, 378, 380, 379, + 379, 382, 383, 381, 384, 384, 384, 384, 385, 385, + 385, 387, 388, 386, 386, 390, 391, 389, 389, 393, + 394, 392, 392, 396, 397, 395, 395, 398, 400, 399, + 399, 401, 402, 403, 403, 404, 406, 407, 408, 405, + 410, 411, 409, 413, 412, 412, 414, 414, 414, 416, + 415, 417, 415, 418, 415, 419, 415, 420, 415, 421, + 415, 422, 415, 423, 424, 424, 425, 426, 427, 427, + 428, 429, 430, 432, 431, 434, 435, 436, 437, 438, + 439, 433, 441, 440, 440, 442, 442, 444, 445, 443, + 446, 446, 447, 448, 447, 449, 447, 451, 452, 450, + 454, 455, 453, 456, 456, 456, 457, 457, 458, 459, + 461, 462, 463, 460, 464, 465, 466, 468, 467, 470, + 471, 472, 469, 473, 473, 474, 474, 474, 474, 474, + 474, 474, 474, 474, 474, 475, 476, 476, 477, 477, + 478, 479, 479, 480, 482, 483, 484, 485, 481, 486, + 486, 487, 487, 488, 488, 489, 488, 490, 490, 491, + 492, 492, 493, 494, 496, 497, 495, 499, 500, 498, + 501, 501, 503, 502, 504, 502, 505, 502, 506, 502 }; - /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ -static const yytype_uint8 yyr2[] = + /* YYR2YYN -- Number of symbols on the right hand side of rule YYN. */ +static const yytype_int8 yyr2[] = { 0, 2, 1, 1, 0, 3, 2, 1, 2, 2, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, @@ -1633,63 +2253,63 @@ static const yytype_uint8 yyr2[] = 0, 3, 2, 3, 3, 0, 4, 0, 1, 1, 1, 1, 2, 1, 0, 0, 0, 7, 0, 0, 0, 8, 0, 4, 0, 3, 1, 0, 2, 0, - 2, 1, 2, 2, 0, 1, 1, 2, 1, 1, - 2, 1, 0, 3, 2, 0, 3, 0, 3, 0, + 2, 1, 2, 3, 2, 0, 1, 1, 0, 3, + 1, 1, 2, 1, 0, 3, 2, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, - 3, 2, 0, 4, 0, 1, 0, 3, 0, 4, - 1, 1, 1, 2, 2, 0, 0, 0, 0, 9, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 3, 1, 3, 1, 3, 1, 3, 3, - 1, 3, 3, 1, 3, 3, 3, 1, 2, 2, - 2, 1, 1, 3, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 0, 6, 2, 0, 1, - 2, 2, 0, 4, 1, 1, 4, 2, 0, 2, - 2, 0, 0, 4, 3, 0, 1, 1, 2, 3, - 0, 3, 0, 3, 1, 1, 1, 2, 1, 0, - 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 2, 0, 4, 0, 1, 1, 2, - 0, 4, 0, 1, 1, 1, 1, 1, 2, 1, - 2, 3, 2, 1, 1, 2, 1, 1, 1, 1, - 1, 1, 1, 0, 3, 0, 0, 0, 7, 2, - 2, 0, 2, 0, 0, 5, 0, 3, 0, 3, - 0, 0, 0, 0, 0, 0, 15, 1, 1, 1, - 1, 1, 1, 2, 2, 0, 0, 0, 6, 0, - 3, 2, 2, 0, 0, 3, 0, 0, 5, 0, - 3, 1, 1, 0, 0, 0, 0, 9, 2, 0, - 4, 0, 2, 0, 0, 6, 2, 0, 0, 6, - 6, 0, 0, 6, 1, 1, 0, 0, 6, 1, - 1, 0, 4, 2, 2, 0, 0, 0, 5, 1, - 1, 0, 0, 0, 0, 9, 0, 0, 0, 0, - 9, 0, 0, 0, 0, 9, 0, 0, 0, 0, - 10, 1, 1, 0, 1, 1, 0, 0, 0, 8, - 0, 3, 0, 4, 2, 0, 4, 0, 0, 0, - 5, 0, 3, 0, 4, 2, 0, 4, 0, 0, - 0, 5, 1, 1, 1, 1, 1, 1, 1, 0, - 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, - 0, 0, 0, 6, 0, 2, 0, 4, 0, 3, - 3, 1, 1, 2, 0, 0, 0, 7, 0, 0, - 6, 0, 3, 0, 2, 0, 0, 3, 0, 3, - 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, - 3, 1, 1, 3, 2, 1, 0, 3, 3, 3, - 0, 3, 0, 0, 0, 0, 0, 0, 13, 0, - 3, 0, 2, 0, 0, 0, 5, 2, 0, 1, - 0, 3, 0, 3, 0, 0, 6, 0, 0, 6, - 1, 1, 1, 1, 1, 2, 3, 0, 0, 0, - 8, 3, 3, 2, 0, 3, 0, 0, 0, 8, + 3, 0, 3, 2, 0, 4, 0, 1, 0, 3, + 0, 4, 1, 1, 1, 2, 2, 0, 0, 0, + 0, 9, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 3, 1, 3, 1, 3, 1, + 3, 3, 1, 3, 3, 1, 3, 3, 3, 1, + 2, 2, 2, 1, 1, 3, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 0, 6, 2, + 0, 1, 2, 2, 0, 4, 1, 1, 4, 2, + 0, 2, 2, 0, 0, 4, 3, 0, 1, 1, + 2, 3, 0, 3, 0, 3, 1, 1, 1, 2, + 1, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 2, 3, 0, 2, 5, 2, 3, 0, - 1, 0, 0, 0, 0, 10, 2, 2, 0, 0, - 3, 0, 3, 0, 3, 3, 3, 3, 4, 0, - 1, 2, 0, 0, 6, 0, 0, 5, 2, 0, - 0, 3, 0, 3, 0, 3, 0, 3 + 1, 1, 1, 1, 1, 2, 0, 4, 0, 1, + 1, 2, 0, 4, 0, 1, 1, 1, 1, 1, + 2, 1, 2, 3, 2, 1, 1, 2, 1, 1, + 1, 1, 1, 1, 1, 0, 3, 0, 0, 0, + 7, 2, 2, 0, 2, 0, 0, 5, 0, 3, + 0, 3, 0, 0, 0, 0, 0, 0, 15, 1, + 1, 1, 1, 1, 1, 2, 2, 0, 0, 0, + 6, 0, 3, 2, 2, 0, 0, 3, 0, 0, + 5, 0, 3, 1, 1, 0, 0, 0, 0, 9, + 2, 0, 4, 0, 2, 0, 0, 6, 2, 0, + 0, 6, 6, 0, 0, 6, 1, 1, 0, 0, + 6, 1, 1, 0, 4, 2, 2, 0, 0, 0, + 5, 1, 1, 0, 0, 0, 0, 9, 0, 0, + 0, 0, 9, 0, 0, 0, 0, 9, 0, 0, + 0, 0, 10, 1, 1, 0, 1, 1, 0, 0, + 0, 7, 0, 3, 0, 4, 2, 0, 4, 0, + 0, 0, 5, 0, 3, 0, 4, 2, 0, 4, + 0, 0, 0, 5, 1, 1, 1, 1, 1, 1, + 1, 0, 0, 6, 0, 0, 0, 6, 0, 0, + 0, 6, 0, 0, 0, 6, 0, 2, 0, 4, + 0, 3, 3, 1, 1, 2, 0, 0, 0, 7, + 0, 0, 6, 0, 3, 0, 3, 2, 0, 0, + 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, + 3, 0, 3, 3, 1, 1, 3, 2, 1, 0, + 3, 3, 3, 0, 3, 0, 0, 0, 0, 0, + 0, 13, 0, 3, 0, 2, 0, 0, 0, 5, + 2, 0, 1, 0, 3, 0, 3, 0, 0, 6, + 0, 0, 6, 1, 1, 1, 1, 1, 2, 3, + 0, 0, 0, 8, 3, 3, 2, 0, 3, 0, + 0, 0, 8, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 2, 2, 3, 0, 2, 5, + 2, 3, 0, 1, 0, 0, 0, 0, 9, 3, + 2, 1, 0, 2, 2, 0, 3, 3, 3, 3, + 4, 0, 1, 2, 0, 0, 6, 0, 0, 5, + 2, 0, 0, 3, 0, 3, 0, 3, 0, 3 }; +enum { YYENOMEM = -2 }; + #define yyerrok (yyerrstatus = 0) #define yyclearin (yychar = YYEMPTY) -#define YYEMPTY (-2) -#define YYEOF 0 #define YYACCEPT goto yyacceptlab #define YYABORT goto yyabortlab @@ -1715,10 +2335,9 @@ static const yytype_uint8 yyr2[] = } \ while (0) -/* Error token number */ -#define YYTERROR 1 -#define YYERRCODE 256 - +/* Backward compatibility with an undocumented macro. + Use YYerror or YYUNDEF. */ +#define YYERRCODE YYUNDEF /* Enable debugging if requested. */ @@ -1736,18 +2355,18 @@ do { \ } while (0) /* This macro is provided for backward compatibility. */ -#ifndef YY_LOCATION_PRINT -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -#endif +# ifndef YY_LOCATION_PRINT +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +# endif -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +# define YY_SYMBOL_PRINT(Title, Kind, Value, Location) \ do { \ if (yydebug) \ { \ YYFPRINTF (stderr, "%s ", Title); \ yy_symbol_print (stderr, \ - Type, Value); \ + Kind, Value); \ YYFPRINTF (stderr, "\n"); \ } \ } while (0) @@ -1758,17 +2377,20 @@ do { \ `-----------------------------------*/ static void -yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep) +yy_symbol_value_print (FILE *yyo, + yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep) { FILE *yyoutput = yyo; YYUSE (yyoutput); if (!yyvaluep) return; # ifdef YYPRINT - if (yytype < YYNTOKENS) - YYPRINT (yyo, yytoknum[yytype], *yyvaluep); + if (yykind < YYNTOKENS) + YYPRINT (yyo, yytoknum[yykind], *yyvaluep); # endif - YYUSE (yytype); + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN + YYUSE (yykind); + YY_IGNORE_MAYBE_UNINITIALIZED_END } @@ -1777,12 +2399,13 @@ yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep) `---------------------------*/ static void -yy_symbol_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep) +yy_symbol_print (FILE *yyo, + yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep) { YYFPRINTF (yyo, "%s %s (", - yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]); + yykind < YYNTOKENS ? "token" : "nterm", yysymbol_name (yykind)); - yy_symbol_value_print (yyo, yytype, yyvaluep); + yy_symbol_value_print (yyo, yykind, yyvaluep); YYFPRINTF (yyo, ")"); } @@ -1792,7 +2415,7 @@ yy_symbol_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep) `------------------------------------------------------------------*/ static void -yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) +yy_stack_print (yy_state_t *yybottom, yy_state_t *yytop) { YYFPRINTF (stderr, "Stack now"); for (; yybottom <= yytop; yybottom++) @@ -1815,21 +2438,21 @@ do { \ `------------------------------------------------*/ static void -yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule) +yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp, + int yyrule) { - unsigned long yylno = yyrline[yyrule]; + int yylno = yyrline[yyrule]; int yynrhs = yyr2[yyrule]; int yyi; - YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", + YYFPRINTF (stderr, "Reducing stack by rule %d (line %d):\n", yyrule - 1, yylno); /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { YYFPRINTF (stderr, " $%d = ", yyi + 1); yy_symbol_print (stderr, - yystos[yyssp[yyi + 1 - yynrhs]], - &yyvsp[(yyi + 1) - (yynrhs)] - ); + YY_ACCESSING_SYMBOL (+yyssp[yyi + 1 - yynrhs]), + &yyvsp[(yyi + 1) - (yynrhs)]); YYFPRINTF (stderr, "\n"); } } @@ -1844,8 +2467,8 @@ do { \ multiple parsers can coexist. */ int yydebug; #else /* !YYDEBUG */ -# define YYDPRINTF(Args) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) +# define YYDPRINTF(Args) ((void) 0) +# define YY_SYMBOL_PRINT(Title, Kind, Value, Location) # define YY_STACK_PRINT(Bottom, Top) # define YY_REDUCE_PRINT(Rule) #endif /* !YYDEBUG */ @@ -1868,253 +2491,29 @@ int yydebug; #endif -#if YYERROR_VERBOSE - -# ifndef yystrlen -# if defined __GLIBC__ && defined _STRING_H -# define yystrlen strlen -# else -/* Return the length of YYSTR. */ -static YYSIZE_T -yystrlen (const char *yystr) -{ - YYSIZE_T yylen; - for (yylen = 0; yystr[yylen]; yylen++) - continue; - return yylen; -} -# endif -# endif - -# ifndef yystpcpy -# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE -# define yystpcpy stpcpy -# else -/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in - YYDEST. */ -static char * -yystpcpy (char *yydest, const char *yysrc) -{ - char *yyd = yydest; - const char *yys = yysrc; - - while ((*yyd++ = *yys++) != '\0') - continue; - - return yyd - 1; -} -# endif -# endif -# ifndef yytnamerr -/* Copy to YYRES the contents of YYSTR after stripping away unnecessary - quotes and backslashes, so that it's suitable for yyerror. The - heuristic is that double-quoting is unnecessary unless the string - contains an apostrophe, a comma, or backslash (other than - backslash-backslash). YYSTR is taken from yytname. If YYRES is - null, do not copy; instead, return the length of what the result - would have been. */ -static YYSIZE_T -yytnamerr (char *yyres, const char *yystr) -{ - if (*yystr == '"') - { - YYSIZE_T yyn = 0; - char const *yyp = yystr; - - for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - else - goto append; - - append: - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } - do_not_strip_quotes: ; - } - if (! yyres) - return yystrlen (yystr); - return (YYSIZE_T) (yystpcpy (yyres, yystr) - yyres); -} -# endif - -/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message - about the unexpected token YYTOKEN for the state stack whose top is - YYSSP. - - Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is - not large enough to hold the message. In that case, also set - *YYMSG_ALLOC to the required number of bytes. Return 2 if the - required number of bytes is too large to store. */ -static int -yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, - yytype_int16 *yyssp, int yytoken) -{ - YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]); - YYSIZE_T yysize = yysize0; - enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; - /* Internationalized format string. */ - const char *yyformat = YY_NULLPTR; - /* Arguments of yyformat. */ - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - /* Number of reported tokens (one for the "unexpected", one per - "expected"). */ - int yycount = 0; - - /* There are many possibilities here to consider: - - If this state is a consistent state with a default action, then - the only way this function was invoked is if the default action - is an error action. In that case, don't check for expected - tokens because there are none. - - The only way there can be no lookahead present (in yychar) is if - this state is a consistent state with a default action. Thus, - detecting the absence of a lookahead is sufficient to determine - that there is no unexpected or expected token to report. In that - case, just report a simple "syntax error". - - Don't assume there isn't a lookahead just because this state is a - consistent state with a default action. There might have been a - previous inconsistent state, consistent state with a non-default - action, or user semantic action that manipulated yychar. - - Of course, the expected token list depends on states to have - correct lookahead information, and it depends on the parser not - to perform extra reductions after fetching a lookahead from the - scanner and before detecting a syntax error. Thus, state merging - (from LALR or IELR) and default reductions corrupt the expected - token list. However, the list is correct for canonical LR with - one exception: it will still contain any token that will not be - accepted due to an error action in a later state. - */ - if (yytoken != YYEMPTY) - { - int yyn = yypact[*yyssp]; - yyarg[yycount++] = yytname[yytoken]; - if (!yypact_value_is_default (yyn)) - { - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. In other words, skip the first -YYN actions for - this state because they are default actions. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn + 1; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yyx; - - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR - && !yytable_value_is_error (yytable[yyx + yyn])) - { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - break; - } - yyarg[yycount++] = yytname[yyx]; - { - YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]); - if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM) - yysize = yysize1; - else - return 2; - } - } - } - } - - switch (yycount) - { -# define YYCASE_(N, S) \ - case N: \ - yyformat = S; \ - break - default: /* Avoid compiler warnings. */ - YYCASE_(0, YY_("syntax error")); - YYCASE_(1, YY_("syntax error, unexpected %s")); - YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); - YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); - YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); - YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); -# undef YYCASE_ - } - - { - YYSIZE_T yysize1 = yysize + yystrlen (yyformat); - if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM) - yysize = yysize1; - else - return 2; - } - - if (*yymsg_alloc < yysize) - { - *yymsg_alloc = 2 * yysize; - if (! (yysize <= *yymsg_alloc - && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) - *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; - return 1; - } - - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - { - char *yyp = *yymsg; - int yyi = 0; - while ((*yyp = *yyformat) != '\0') - if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyformat += 2; - } - else - { - yyp++; - yyformat++; - } - } - return 0; -} -#endif /* YYERROR_VERBOSE */ /*-----------------------------------------------. | Release the memory associated to this symbol. | `-----------------------------------------------*/ static void -yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) +yydestruct (const char *yymsg, + yysymbol_kind_t yykind, YYSTYPE *yyvaluep) { YYUSE (yyvaluep); if (!yymsg) yymsg = "Deleting"; - YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); + YY_SYMBOL_PRINT (yymsg, yykind, yyvaluep, yylocationp); YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN - YYUSE (yytype); + YYUSE (yykind); YY_IGNORE_MAYBE_UNINITIALIZED_END } - - /* The lookahead symbol. */ int yychar; @@ -2124,6 +2523,8 @@ YYSTYPE yylval; int yynerrs; + + /*----------. | yyparse. | `----------*/ @@ -2131,7 +2532,7 @@ int yynerrs; int yyparse (void) { - int yystate; + yy_state_fast_t yystate; /* Number of tokens to shift before error messages enabled. */ int yyerrstatus; @@ -2142,32 +2543,29 @@ yyparse (void) Refer to the stacks through separate pointers, to allow yyoverflow to reallocate them elsewhere. */ + /* Their size. */ + YYPTRDIFF_T yystacksize; + /* The state stack. */ - yytype_int16 yyssa[YYINITDEPTH]; - yytype_int16 *yyss; - yytype_int16 *yyssp; + yy_state_t yyssa[YYINITDEPTH]; + yy_state_t *yyss; + yy_state_t *yyssp; /* The semantic value stack. */ YYSTYPE yyvsa[YYINITDEPTH]; YYSTYPE *yyvs; YYSTYPE *yyvsp; - YYSIZE_T yystacksize; - int yyn; + /* The return value of yyparse. */ int yyresult; /* Lookahead token as an internal (translated) token number. */ - int yytoken = 0; + yysymbol_kind_t yytoken = YYSYMBOL_YYEMPTY; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; -#if YYERROR_VERBOSE - /* Buffer for error messages, and its allocated size. */ - char yymsgbuf[128]; - char *yymsg = yymsgbuf; - YYSIZE_T yymsg_alloc = sizeof yymsgbuf; -#endif + #define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) @@ -2175,15 +2573,17 @@ yyparse (void) Keep to zero when no symbol should be popped. */ int yylen = 0; + yynerrs = 0; + yystate = 0; + yyerrstatus = 0; + + yystacksize = YYINITDEPTH; yyssp = yyss = yyssa; yyvsp = yyvs = yyvsa; - yystacksize = YYINITDEPTH; + YYDPRINTF ((stderr, "Starting parse\n")); - yystate = 0; - yyerrstatus = 0; - yynerrs = 0; yychar = YYEMPTY; /* Cause a token to be read. */ goto yysetstate; @@ -2198,12 +2598,15 @@ yynewstate: /*--------------------------------------------------------------------. -| yynewstate -- set current state (the top of the stack) to yystate. | +| yysetstate -- set current state (the top of the stack) to yystate. | `--------------------------------------------------------------------*/ yysetstate: YYDPRINTF ((stderr, "Entering state %d\n", yystate)); YY_ASSERT (0 <= yystate && yystate < YYNSTATES); - *yyssp = (yytype_int16) yystate; + YY_IGNORE_USELESS_CAST_BEGIN + *yyssp = YY_CAST (yy_state_t, yystate); + YY_IGNORE_USELESS_CAST_END + YY_STACK_PRINT (yyss, yyssp); if (yyss + yystacksize - 1 <= yyssp) #if !defined yyoverflow && !defined YYSTACK_RELOCATE @@ -2211,23 +2614,23 @@ yysetstate: #else { /* Get the current used size of the three stacks, in elements. */ - YYSIZE_T yysize = (YYSIZE_T) (yyssp - yyss + 1); + YYPTRDIFF_T yysize = yyssp - yyss + 1; # if defined yyoverflow { /* Give user a chance to reallocate the stack. Use copies of these so that the &'s don't force the real ones into memory. */ + yy_state_t *yyss1 = yyss; YYSTYPE *yyvs1 = yyvs; - yytype_int16 *yyss1 = yyss; /* Each stack pointer address is followed by the size of the data in use in that stack, in bytes. This used to be a conditional around just the two extra args, but that might be undefined if yyoverflow is a macro. */ yyoverflow (YY_("memory exhausted"), - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), + &yyss1, yysize * YYSIZEOF (*yyssp), + &yyvs1, yysize * YYSIZEOF (*yyvsp), &yystacksize); yyss = yyss1; yyvs = yyvs1; @@ -2241,14 +2644,15 @@ yysetstate: yystacksize = YYMAXDEPTH; { - yytype_int16 *yyss1 = yyss; + yy_state_t *yyss1 = yyss; union yyalloc *yyptr = - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); + YY_CAST (union yyalloc *, + YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize)))); if (! yyptr) goto yyexhaustedlab; YYSTACK_RELOCATE (yyss_alloc, yyss); YYSTACK_RELOCATE (yyvs_alloc, yyvs); -# undef YYSTACK_RELOCATE +# undef YYSTACK_RELOCATE if (yyss1 != yyssa) YYSTACK_FREE (yyss1); } @@ -2257,8 +2661,10 @@ yysetstate: yyssp = yyss + yysize - 1; yyvsp = yyvs + yysize - 1; - YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long) yystacksize)); + YY_IGNORE_USELESS_CAST_BEGIN + YYDPRINTF ((stderr, "Stack size increased to %ld\n", + YY_CAST (long, yystacksize))); + YY_IGNORE_USELESS_CAST_END if (yyss + yystacksize - 1 <= yyssp) YYABORT; @@ -2285,18 +2691,29 @@ yybackup: /* Not known => get a lookahead token if don't already have one. */ - /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ + /* YYCHAR is either empty, or end-of-input, or a valid lookahead. */ if (yychar == YYEMPTY) { - YYDPRINTF ((stderr, "Reading a token: ")); + YYDPRINTF ((stderr, "Reading a token\n")); yychar = yylex (); } if (yychar <= YYEOF) { - yychar = yytoken = YYEOF; + yychar = YYEOF; + yytoken = YYSYMBOL_YYEOF; YYDPRINTF ((stderr, "Now at end of input.\n")); } + else if (yychar == YYerror) + { + /* The scanner already issued an error message, process directly + to error recovery. But do not keep the error token as + lookahead, it is too special and may lead us to an endless + loop in error recovery. */ + yychar = YYUNDEF; + yytoken = YYSYMBOL_YYerror; + goto yyerrlab1; + } else { yytoken = YYTRANSLATE (yychar); @@ -2324,14 +2741,13 @@ yybackup: /* Shift the lookahead token. */ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - - /* Discard the shifted token. */ - yychar = YYEMPTY; - yystate = yyn; YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; YY_IGNORE_MAYBE_UNINITIALIZED_END + + /* Discard the shifted token. */ + yychar = YYEMPTY; goto yynewstate; @@ -2367,292 +2783,285 @@ yyreduce: switch (yyn) { case 5: -#line 413 "fe/idl.ypp" - { - AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val); - AST_Decl *d = (yyvsp[0].dcval); - if (d) +#line 417 "fe/idl.ypp" + { + AST_Annotation_Appls *&annotations = (yyvsp[-1].annotations_val); + AST_Decl *&node = (yyvsp[0].dcval); + if (node) { - d->annotation_appls (*annotations); + node->annotation_appls (*annotations); } else { - idl_global->err ()-> unsupported_warning( + idl_global->err ()-> unsupported_warning ( "Annotating this is not supported"); } delete annotations; } -#line 2386 "fe/idl.tab.cpp" - break; - - case 6: -#line 428 "fe/idl.ypp" - { - } -#line 2393 "fe/idl.tab.cpp" +#line 2802 "fe/idl.tab.cpp" break; case 10: -#line 440 "fe/idl.ypp" - { +#line 442 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_AnnotationDeclSeen); } -#line 2401 "fe/idl.tab.cpp" +#line 2810 "fe/idl.tab.cpp" break; case 11: -#line 444 "fe/idl.ypp" - { +#line 446 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2409 "fe/idl.tab.cpp" +#line 2818 "fe/idl.tab.cpp" break; case 12: -#line 448 "fe/idl.ypp" - { +#line 450 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_TypeDeclSeen); } -#line 2417 "fe/idl.tab.cpp" +#line 2826 "fe/idl.tab.cpp" break; case 13: -#line 452 "fe/idl.ypp" - { +#line 454 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2425 "fe/idl.tab.cpp" +#line 2834 "fe/idl.tab.cpp" break; case 14: -#line 456 "fe/idl.ypp" - { +#line 458 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_TypeIdDeclSeen); } -#line 2433 "fe/idl.tab.cpp" +#line 2842 "fe/idl.tab.cpp" break; case 15: -#line 460 "fe/idl.ypp" - { +#line 462 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2441 "fe/idl.tab.cpp" +#line 2850 "fe/idl.tab.cpp" break; case 16: -#line 464 "fe/idl.ypp" - { +#line 466 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_TypePrefixDeclSeen); } -#line 2449 "fe/idl.tab.cpp" +#line 2858 "fe/idl.tab.cpp" break; case 17: -#line 468 "fe/idl.ypp" - { +#line 470 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2457 "fe/idl.tab.cpp" +#line 2866 "fe/idl.tab.cpp" break; case 18: -#line 472 "fe/idl.ypp" - { +#line 474 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ConstDeclSeen); } -#line 2465 "fe/idl.tab.cpp" +#line 2874 "fe/idl.tab.cpp" break; case 19: -#line 476 "fe/idl.ypp" - { +#line 478 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2473 "fe/idl.tab.cpp" +#line 2882 "fe/idl.tab.cpp" break; case 20: -#line 480 "fe/idl.ypp" - { +#line 482 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptDeclSeen); } -#line 2481 "fe/idl.tab.cpp" +#line 2890 "fe/idl.tab.cpp" break; case 21: -#line 484 "fe/idl.ypp" - { +#line 486 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2489 "fe/idl.tab.cpp" +#line 2898 "fe/idl.tab.cpp" break; case 22: -#line 488 "fe/idl.ypp" - { +#line 490 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceDeclSeen); } -#line 2497 "fe/idl.tab.cpp" +#line 2906 "fe/idl.tab.cpp" break; case 23: -#line 492 "fe/idl.ypp" - { +#line 494 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2505 "fe/idl.tab.cpp" +#line 2914 "fe/idl.tab.cpp" break; case 24: -#line 496 "fe/idl.ypp" - { +#line 498 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleDeclSeen); } -#line 2513 "fe/idl.tab.cpp" +#line 2922 "fe/idl.tab.cpp" break; case 25: -#line 500 "fe/idl.ypp" - { +#line 502 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2521 "fe/idl.tab.cpp" +#line 2930 "fe/idl.tab.cpp" break; case 26: -#line 504 "fe/idl.ypp" - { +#line 506 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeDeclSeen); } -#line 2529 "fe/idl.tab.cpp" +#line 2938 "fe/idl.tab.cpp" break; case 27: -#line 508 "fe/idl.ypp" - { +#line 510 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2537 "fe/idl.tab.cpp" +#line 2946 "fe/idl.tab.cpp" break; case 28: -#line 512 "fe/idl.ypp" - { +#line 514 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentDeclSeen); } -#line 2545 "fe/idl.tab.cpp" +#line 2954 "fe/idl.tab.cpp" break; case 29: -#line 516 "fe/idl.ypp" - { +#line 518 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2553 "fe/idl.tab.cpp" +#line 2962 "fe/idl.tab.cpp" break; case 30: -#line 520 "fe/idl.ypp" - { +#line 522 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_HomeDeclSeen); } -#line 2561 "fe/idl.tab.cpp" +#line 2970 "fe/idl.tab.cpp" break; case 31: -#line 524 "fe/idl.ypp" - { +#line 526 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2569 "fe/idl.tab.cpp" +#line 2978 "fe/idl.tab.cpp" break; case 32: -#line 528 "fe/idl.ypp" - { +#line 530 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_EventDeclSeen); } -#line 2577 "fe/idl.tab.cpp" +#line 2986 "fe/idl.tab.cpp" break; case 33: -#line 532 "fe/idl.ypp" - { +#line 534 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2585 "fe/idl.tab.cpp" +#line 2994 "fe/idl.tab.cpp" break; case 34: -#line 536 "fe/idl.ypp" - { +#line 538 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeDeclSeen); } -#line 2593 "fe/idl.tab.cpp" +#line 3002 "fe/idl.tab.cpp" break; case 35: -#line 540 "fe/idl.ypp" - { +#line 542 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2601 "fe/idl.tab.cpp" +#line 3010 "fe/idl.tab.cpp" break; case 36: -#line 544 "fe/idl.ypp" - { +#line 546 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorDeclSeen); } -#line 2609 "fe/idl.tab.cpp" +#line 3018 "fe/idl.tab.cpp" break; case 37: -#line 548 "fe/idl.ypp" - { +#line 550 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2617 "fe/idl.tab.cpp" +#line 3026 "fe/idl.tab.cpp" break; case 38: -#line 552 "fe/idl.ypp" - { - idl_global->err()->syntax_error (idl_global->parse_state()); +#line 554 "fe/idl.ypp" + { + idl_global->err ()->syntax_error (idl_global->parse_state ()); } -#line 2625 "fe/idl.tab.cpp" +#line 3034 "fe/idl.tab.cpp" break; case 39: -#line 556 "fe/idl.ypp" - { +#line 558 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); yyerrok; (yyval.dcval) = 0; } -#line 2635 "fe/idl.tab.cpp" +#line 3044 "fe/idl.tab.cpp" break; case 40: -#line 565 "fe/idl.ypp" - { +#line 567 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleSeen); } -#line 2643 "fe/idl.tab.cpp" +#line 3052 "fe/idl.tab.cpp" break; case 41: -#line 569 "fe/idl.ypp" - { +#line 571 "fe/idl.ypp" + { (yyval.idlist) = (yyvsp[0].idlist); } -#line 2651 "fe/idl.tab.cpp" +#line 3060 "fe/idl.tab.cpp" break; case 42: -#line 576 "fe/idl.ypp" - { +#line 578 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleIDSeen); // The module_header rule is common to template module, fixed @@ -2690,28 +3099,28 @@ yyreduce: (yyval.dcval) = m; } -#line 2694 "fe/idl.tab.cpp" +#line 3103 "fe/idl.tab.cpp" break; case 43: -#line 615 "fe/idl.ypp" - { +#line 617 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleSqSeen); } -#line 2702 "fe/idl.tab.cpp" +#line 3111 "fe/idl.tab.cpp" break; case 44: -#line 619 "fe/idl.ypp" - { +#line 621 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleBodySeen); } -#line 2710 "fe/idl.tab.cpp" +#line 3119 "fe/idl.tab.cpp" break; case 45: -#line 623 "fe/idl.ypp" - { +#line 625 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleQsSeen); /* * Finished with this module - pop it from the scope stack. @@ -2720,20 +3129,20 @@ yyreduce: idl_global->scopes ().pop (); (yyval.dcval) = (yyvsp[-5].dcval); } -#line 2724 "fe/idl.tab.cpp" +#line 3133 "fe/idl.tab.cpp" break; case 46: -#line 636 "fe/idl.ypp" - { +#line 638 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleIDSeen); } -#line 2732 "fe/idl.tab.cpp" +#line 3141 "fe/idl.tab.cpp" break; case 47: -#line 643 "fe/idl.ypp" - { +#line 645 "fe/idl.ypp" + { // The module_header rule is common to template module, fixed // module and instantiated template module. In the last // case, a fully scoped name is allowed, but here we @@ -2746,12 +3155,12 @@ yyreduce: IDL_GlobalData::PS_ModuleIDSeen); } } -#line 2750 "fe/idl.tab.cpp" +#line 3159 "fe/idl.tab.cpp" break; case 48: -#line 657 "fe/idl.ypp" - { +#line 659 "fe/idl.ypp" + { if (FE_Utils::duplicate_param_id ((yyvsp[0].plval))) { idl_global->err ()->duplicate_param_id ( @@ -2760,12 +3169,12 @@ yyreduce: return 1; } } -#line 2764 "fe/idl.tab.cpp" +#line 3173 "fe/idl.tab.cpp" break; case 49: -#line 667 "fe/idl.ypp" - { +#line 669 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleParamsSeen); AST_Template_Module *tm = @@ -2794,28 +3203,28 @@ yyreduce: // of the template module. idl_global->current_params ((yyvsp[-2].plval)); } -#line 2798 "fe/idl.tab.cpp" +#line 3207 "fe/idl.tab.cpp" break; case 50: -#line 697 "fe/idl.ypp" - { +#line 699 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleSqSeen); } -#line 2806 "fe/idl.tab.cpp" +#line 3215 "fe/idl.tab.cpp" break; case 51: -#line 701 "fe/idl.ypp" - { +#line 703 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleBodySeen); } -#line 2814 "fe/idl.tab.cpp" +#line 3223 "fe/idl.tab.cpp" break; case 52: -#line 705 "fe/idl.ypp" - { +#line 707 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleQsSeen); /* @@ -2833,30 +3242,30 @@ yyreduce: (yyval.dcval) = 0; } -#line 2837 "fe/idl.tab.cpp" +#line 3246 "fe/idl.tab.cpp" break; case 58: -#line 741 "fe/idl.ypp" - { +#line 743 "fe/idl.ypp" + { idl_global->set_parse_state ( IDL_GlobalData::PS_ModuleRefSeen); } -#line 2846 "fe/idl.tab.cpp" +#line 3255 "fe/idl.tab.cpp" break; case 59: -#line 746 "fe/idl.ypp" - { +#line 748 "fe/idl.ypp" + { idl_global->set_parse_state ( IDL_GlobalData::PS_ModuleRefParamsSeen); } -#line 2855 "fe/idl.tab.cpp" +#line 3264 "fe/idl.tab.cpp" break; case 60: -#line 751 "fe/idl.ypp" - { +#line 753 "fe/idl.ypp" + { idl_global->set_parse_state ( IDL_GlobalData::PS_ModuleRefIDSeen); @@ -2933,30 +3342,30 @@ yyreduce: idl_global->in_tmpl_mod_no_alias (itmna_flag); idl_global->in_tmpl_mod_alias (false); } -#line 2937 "fe/idl.tab.cpp" +#line 3346 "fe/idl.tab.cpp" break; case 61: -#line 832 "fe/idl.ypp" - { +#line 834 "fe/idl.ypp" + { idl_global->set_parse_state ( IDL_GlobalData::PS_InstModuleSeen); } -#line 2946 "fe/idl.tab.cpp" +#line 3355 "fe/idl.tab.cpp" break; case 62: -#line 837 "fe/idl.ypp" - { +#line 839 "fe/idl.ypp" + { idl_global->set_parse_state ( IDL_GlobalData::PS_InstModuleArgsSeen); } -#line 2955 "fe/idl.tab.cpp" +#line 3364 "fe/idl.tab.cpp" break; case 63: -#line 842 "fe/idl.ypp" - { +#line 844 "fe/idl.ypp" + { idl_global->set_parse_state ( IDL_GlobalData::PS_InstModuleIDSeen); @@ -3019,12 +3428,12 @@ yyreduce: (yyval.dcval) = 0; } -#line 3023 "fe/idl.tab.cpp" +#line 3432 "fe/idl.tab.cpp" break; case 66: -#line 914 "fe/idl.ypp" - { +#line 916 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Interface *i = 0; @@ -3061,59 +3470,59 @@ yyreduce: */ idl_global->scopes ().push (i); } -#line 3065 "fe/idl.tab.cpp" +#line 3474 "fe/idl.tab.cpp" break; case 67: -#line 952 "fe/idl.ypp" - { +#line 954 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceSqSeen); } -#line 3073 "fe/idl.tab.cpp" +#line 3482 "fe/idl.tab.cpp" break; case 68: -#line 956 "fe/idl.ypp" - { +#line 958 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceBodySeen); } -#line 3081 "fe/idl.tab.cpp" +#line 3490 "fe/idl.tab.cpp" break; case 69: -#line 960 "fe/idl.ypp" - { +#line 962 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceQsSeen); - (yyval.dcval) = dynamic_cast<AST_Decl*> (idl_global->scopes ().top_non_null ()); + (yyval.dcval) = dynamic_cast<AST_Decl *> (idl_global->scopes ().top_non_null ()); /* * Done with this interface - pop it off the scopes stack */ idl_global->scopes ().pop (); } -#line 3095 "fe/idl.tab.cpp" +#line 3504 "fe/idl.tab.cpp" break; case 70: -#line 973 "fe/idl.ypp" - { +#line 975 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceSeen); } -#line 3103 "fe/idl.tab.cpp" +#line 3512 "fe/idl.tab.cpp" break; case 71: -#line 977 "fe/idl.ypp" - { +#line 979 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 3112 "fe/idl.tab.cpp" +#line 3521 "fe/idl.tab.cpp" break; case 72: -#line 985 "fe/idl.ypp" - { +#line 987 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); if ((yyvsp[0].nlval) != 0 && (yyvsp[0].nlval)->truncatable ()) @@ -3148,12 +3557,12 @@ yyreduce: (yyvsp[0].nlval) = 0; } } -#line 3152 "fe/idl.tab.cpp" +#line 3561 "fe/idl.tab.cpp" break; case 73: -#line 1022 "fe/idl.ypp" - { +#line 1024 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); /* @@ -3181,12 +3590,12 @@ yyreduce: (yyvsp[0].nlval) = 0; } } -#line 3185 "fe/idl.tab.cpp" +#line 3594 "fe/idl.tab.cpp" break; case 74: -#line 1052 "fe/idl.ypp" - { +#line 1054 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); /* @@ -3214,109 +3623,113 @@ yyreduce: (yyvsp[0].nlval) = 0; } } -#line 3218 "fe/idl.tab.cpp" +#line 3627 "fe/idl.tab.cpp" break; case 75: -#line 1084 "fe/idl.ypp" - { +#line 1086 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen); } -#line 3226 "fe/idl.tab.cpp" +#line 3635 "fe/idl.tab.cpp" break; case 76: -#line 1088 "fe/idl.ypp" - { +#line 1090 "fe/idl.ypp" + { (yyvsp[0].nlval)->truncatable ((yyvsp[-2].bval)); (yyval.nlval) = (yyvsp[0].nlval); } -#line 3235 "fe/idl.tab.cpp" +#line 3644 "fe/idl.tab.cpp" break; case 77: -#line 1093 "fe/idl.ypp" - { +#line 1095 "fe/idl.ypp" + { (yyval.nlval) = 0; } -#line 3243 "fe/idl.tab.cpp" +#line 3652 "fe/idl.tab.cpp" break; case 82: -#line 1107 "fe/idl.ypp" - { +#line 1109 "fe/idl.ypp" + { idl_global->err ()->unsupported_error ("custom is not supported"); - (yyval.dcval) = 0; + (yyval.dcval) = (yyvsp[0].dcval); } -#line 3252 "fe/idl.tab.cpp" +#line 3661 "fe/idl.tab.cpp" break; case 84: -#line 1116 "fe/idl.ypp" - { - UTL_Scope *s = idl_global->scopes ().top_non_null (); - AST_ValueType *v = 0; - AST_Interface *i = 0; - - if (s != 0 && (yyvsp[0].vhval) != 0) - { - v = - idl_global->gen ()->create_valuetype ( - (yyvsp[0].vhval)->name (), - (yyvsp[0].vhval)->inherits (), - (yyvsp[0].vhval)->n_inherits (), - (yyvsp[0].vhval)->inherits_concrete (), - (yyvsp[0].vhval)->inherits_flat (), - (yyvsp[0].vhval)->n_inherits_flat (), - (yyvsp[0].vhval)->supports (), - (yyvsp[0].vhval)->n_supports (), - (yyvsp[0].vhval)->supports_concrete (), - false, - (yyvsp[0].vhval)->truncatable (), - false); +#line 1118 "fe/idl.ypp" + { + FE_OBVHeader *&valuetype_header = (yyvsp[0].vhval); + UTL_Scope *scope = idl_global->scopes ().top_non_null (); + AST_ValueType *valuetype = 0; + + if (scope && valuetype_header) + { + valuetype = idl_global->gen ()->create_valuetype ( + valuetype_header->name (), + valuetype_header->inherits (), + valuetype_header->n_inherits (), + valuetype_header->inherits_concrete (), + valuetype_header->inherits_flat (), + valuetype_header->n_inherits_flat (), + valuetype_header->supports (), + valuetype_header->n_supports (), + valuetype_header->supports_concrete (), + false, + valuetype_header->truncatable (), + false); + + AST_Interface *valuetype_as_interface = + dynamic_cast<AST_Interface *> (valuetype); + AST_Interface::fwd_redefinition_helper ( + valuetype_as_interface, scope); + valuetype = dynamic_cast<AST_ValueType *> ( + valuetype_as_interface); - i = AST_Interface::narrow_from_decl (v); - AST_Interface::fwd_redefinition_helper (i, - s); /* * Add the valuetype to its definition scope */ - v = AST_ValueType::narrow_from_decl (i); - (void) s->fe_add_valuetype (v); + scope->fe_add_valuetype (valuetype); // FE_OBVHeader is not automatically destroyed in the AST - (yyvsp[0].vhval)->destroy (); - delete (yyvsp[0].vhval); - (yyvsp[0].vhval) = 0; + valuetype_header->destroy (); + delete valuetype_header; + valuetype_header = 0; } /* * Push it on the scope stack */ - idl_global->scopes ().push (v); + idl_global->scopes ().push (valuetype); + + (yyval.dcval) = valuetype; } -#line 3299 "fe/idl.tab.cpp" +#line 3712 "fe/idl.tab.cpp" break; case 85: -#line 1159 "fe/idl.ypp" - { +#line 1165 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSqSeen); } -#line 3307 "fe/idl.tab.cpp" +#line 3720 "fe/idl.tab.cpp" break; case 86: -#line 1163 "fe/idl.ypp" - { +#line 1169 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeBodySeen); } -#line 3315 "fe/idl.tab.cpp" +#line 3728 "fe/idl.tab.cpp" break; case 87: -#line 1167 "fe/idl.ypp" - { +#line 1173 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeQsSeen); AST_ValueType *vt = @@ -3334,14 +3747,14 @@ yyreduce: */ idl_global->scopes ().pop (); - (yyval.dcval) = 0; + (yyval.dcval) = (yyvsp[-5].dcval); } -#line 3340 "fe/idl.tab.cpp" +#line 3753 "fe/idl.tab.cpp" break; case 88: -#line 1192 "fe/idl.ypp" - { +#line 1198 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_ValueType *v = 0; AST_Interface *i = 0; @@ -3383,28 +3796,28 @@ yyreduce: */ idl_global->scopes ().push (v); } -#line 3387 "fe/idl.tab.cpp" +#line 3800 "fe/idl.tab.cpp" break; case 89: -#line 1235 "fe/idl.ypp" - { +#line 1241 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSqSeen); } -#line 3395 "fe/idl.tab.cpp" +#line 3808 "fe/idl.tab.cpp" break; case 90: -#line 1239 "fe/idl.ypp" - { +#line 1245 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeBodySeen); } -#line 3403 "fe/idl.tab.cpp" +#line 3816 "fe/idl.tab.cpp" break; case 91: -#line 1243 "fe/idl.ypp" - { +#line 1249 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeQsSeen); /* @@ -3414,20 +3827,20 @@ yyreduce: (yyval.dcval) = 0; } -#line 3418 "fe/idl.tab.cpp" +#line 3831 "fe/idl.tab.cpp" break; case 92: -#line 1258 "fe/idl.ypp" - { +#line 1264 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 3426 "fe/idl.tab.cpp" +#line 3839 "fe/idl.tab.cpp" break; case 93: -#line 1262 "fe/idl.ypp" - { +#line 1268 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); UTL_ScopedName *sn = 0; @@ -3457,61 +3870,61 @@ yyreduce: (yyvsp[-2].nlval) = 0; } } -#line 3461 "fe/idl.tab.cpp" +#line 3874 "fe/idl.tab.cpp" break; case 94: -#line 1296 "fe/idl.ypp" - { +#line 1302 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSeen); } -#line 3469 "fe/idl.tab.cpp" +#line 3882 "fe/idl.tab.cpp" break; case 95: -#line 1300 "fe/idl.ypp" - { +#line 1306 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 3478 "fe/idl.tab.cpp" +#line 3891 "fe/idl.tab.cpp" break; case 96: -#line 1308 "fe/idl.ypp" - { +#line 1314 "fe/idl.ypp" + { (yyval.bval) = true; } -#line 3486 "fe/idl.tab.cpp" +#line 3899 "fe/idl.tab.cpp" break; case 97: -#line 1312 "fe/idl.ypp" - { +#line 1318 "fe/idl.ypp" + { (yyval.bval) = false; } -#line 3494 "fe/idl.tab.cpp" +#line 3907 "fe/idl.tab.cpp" break; case 98: -#line 1320 "fe/idl.ypp" - { +#line 1326 "fe/idl.ypp" + { (yyval.nlval) = (yyvsp[0].nlval); } -#line 3502 "fe/idl.tab.cpp" +#line 3915 "fe/idl.tab.cpp" break; case 99: -#line 1324 "fe/idl.ypp" - { +#line 1330 "fe/idl.ypp" + { (yyval.nlval) = 0; } -#line 3510 "fe/idl.tab.cpp" +#line 3923 "fe/idl.tab.cpp" break; case 100: -#line 1332 "fe/idl.ypp" - { +#line 1338 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); @@ -3533,12 +3946,12 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 3537 "fe/idl.tab.cpp" +#line 3950 "fe/idl.tab.cpp" break; case 101: -#line 1356 "fe/idl.ypp" - { +#line 1362 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); @@ -3562,12 +3975,12 @@ yyreduce: (yyval.dcval) = 0; } -#line 3566 "fe/idl.tab.cpp" +#line 3979 "fe/idl.tab.cpp" break; case 102: -#line 1384 "fe/idl.ypp" - { +#line 1390 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ValueBoxDeclSeen); UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -3629,48 +4042,119 @@ yyreduce: (yyval.dcval) = 0; } -#line 3633 "fe/idl.tab.cpp" +#line 4046 "fe/idl.tab.cpp" + break; + + case 103: +#line 1456 "fe/idl.ypp" + { + AST_Annotation_Appls *&annotations = (yyvsp[-1].annotations_val); + AST_Decls *&decls = (yyvsp[0].decls_val); + if (decls) + { + for (size_t i = 0; i < decls->size (); i++) + { + (*decls)[i]->annotation_appls (*annotations); + } + } + else + { + idl_global->err ()-> unsupported_warning ( + "Annotating this is not supported"); + } + delete annotations; + delete decls; + } +#line 4069 "fe/idl.tab.cpp" + break; + + case 104: +#line 1475 "fe/idl.ypp" + { + delete (yyvsp[0].decls_val); + } +#line 4077 "fe/idl.tab.cpp" + break; + + case 107: +#line 1484 "fe/idl.ypp" + { + AST_Decl *&node = (yyvsp[0].dcval); + AST_Decls *value = 0; + if (node) + { + value = new AST_Decls; + value->push_back (node); + } + (yyval.decls_val) = value; + } +#line 4092 "fe/idl.tab.cpp" break; case 108: -#line 1462 "fe/idl.ypp" - { - (yyval.vival) = AST_Field::vis_PUBLIC; +#line 1495 "fe/idl.ypp" + { + AST_Decl *&node = (yyvsp[0].dcval); + AST_Decls *value = 0; + if (node) + { + value = new AST_Decls; + value->push_back (node); + } + (yyval.decls_val) = value; } -#line 3641 "fe/idl.tab.cpp" +#line 4107 "fe/idl.tab.cpp" break; case 109: -#line 1466 "fe/idl.ypp" - { - (yyval.vival) = AST_Field::vis_PRIVATE; +#line 1506 "fe/idl.ypp" + { + (yyval.decls_val) = (yyvsp[-1].decls_val); } -#line 3649 "fe/idl.tab.cpp" +#line 4115 "fe/idl.tab.cpp" break; case 110: -#line 1473 "fe/idl.ypp" - { - if ((yyvsp[0].decls_val)) +#line 1513 "fe/idl.ypp" + { + (yyval.vival) = AST_Field::vis_PUBLIC; + } +#line 4123 "fe/idl.tab.cpp" + break; + + case 111: +#line 1517 "fe/idl.ypp" + { + (yyval.vival) = AST_Field::vis_PRIVATE; + } +#line 4131 "fe/idl.tab.cpp" + break; + + case 112: +#line 1524 "fe/idl.ypp" + { + AST_Field::Visibility &visibility = (yyvsp[-1].vival); + AST_Decls *&decls_ptr = (yyvsp[0].decls_val); + if (decls_ptr) { - AST_Decls &decls = *(yyvsp[0].decls_val); + AST_Decls &decls = *decls_ptr; for (size_t i = 0; i < decls.size (); i++) { - AST_Field * field = dynamic_cast<AST_Field*>(decls[i]); + AST_Field *field = dynamic_cast<AST_Field *> (decls[i]); if (field) { - field->visibility ((yyvsp[-1].vival)); + field->visibility (visibility); } } } - delete (yyvsp[0].decls_val); + (yyval.decls_val) = decls_ptr; } -#line 3669 "fe/idl.tab.cpp" +#line 4153 "fe/idl.tab.cpp" break; - case 113: -#line 1497 "fe/idl.ypp" - { + case 115: +#line 1550 "fe/idl.ypp" + { AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val); AST_Decl *d = (yyvsp[0].dcval); if (d) @@ -3679,173 +4163,166 @@ yyreduce: } else { - idl_global->err ()-> unsupported_warning( + idl_global->err ()-> unsupported_warning ( "Annotating this is not supported"); } delete annotations; } -#line 3688 "fe/idl.tab.cpp" - break; - - case 114: -#line 1512 "fe/idl.ypp" - { - } -#line 3695 "fe/idl.tab.cpp" - break; - - case 115: -#line 1518 "fe/idl.ypp" - { - idl_global->set_parse_state (IDL_GlobalData::PS_TypeDeclSeen); - } -#line 3703 "fe/idl.tab.cpp" - break; - - case 116: -#line 1522 "fe/idl.ypp" - { - idl_global->set_parse_state (IDL_GlobalData::PS_NoState); - } -#line 3711 "fe/idl.tab.cpp" +#line 4172 "fe/idl.tab.cpp" break; case 117: -#line 1526 "fe/idl.ypp" - { - idl_global->set_parse_state (IDL_GlobalData::PS_TypeIdDeclSeen); +#line 1569 "fe/idl.ypp" + { + idl_global->set_parse_state (IDL_GlobalData::PS_TypeDeclSeen); } -#line 3719 "fe/idl.tab.cpp" +#line 4180 "fe/idl.tab.cpp" break; case 118: -#line 1530 "fe/idl.ypp" - { +#line 1573 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3727 "fe/idl.tab.cpp" +#line 4188 "fe/idl.tab.cpp" break; case 119: -#line 1534 "fe/idl.ypp" - { - idl_global->set_parse_state (IDL_GlobalData::PS_TypePrefixDeclSeen); +#line 1577 "fe/idl.ypp" + { + idl_global->set_parse_state (IDL_GlobalData::PS_TypeIdDeclSeen); } -#line 3735 "fe/idl.tab.cpp" +#line 4196 "fe/idl.tab.cpp" break; case 120: -#line 1538 "fe/idl.ypp" - { +#line 1581 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3743 "fe/idl.tab.cpp" +#line 4204 "fe/idl.tab.cpp" break; case 121: -#line 1542 "fe/idl.ypp" - { - idl_global->set_parse_state (IDL_GlobalData::PS_ConstDeclSeen); +#line 1585 "fe/idl.ypp" + { + idl_global->set_parse_state (IDL_GlobalData::PS_TypePrefixDeclSeen); } -#line 3751 "fe/idl.tab.cpp" +#line 4212 "fe/idl.tab.cpp" break; case 122: -#line 1546 "fe/idl.ypp" - { - idl_global->set_parse_state(IDL_GlobalData::PS_NoState); +#line 1589 "fe/idl.ypp" + { + idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3759 "fe/idl.tab.cpp" +#line 4220 "fe/idl.tab.cpp" break; case 123: -#line 1550 "fe/idl.ypp" - { - idl_global->set_parse_state (IDL_GlobalData::PS_ExceptDeclSeen); +#line 1593 "fe/idl.ypp" + { + idl_global->set_parse_state (IDL_GlobalData::PS_ConstDeclSeen); } -#line 3767 "fe/idl.tab.cpp" +#line 4228 "fe/idl.tab.cpp" break; case 124: -#line 1554 "fe/idl.ypp" - { +#line 1597 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3775 "fe/idl.tab.cpp" +#line 4236 "fe/idl.tab.cpp" break; case 125: -#line 1558 "fe/idl.ypp" - { - idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); +#line 1601 "fe/idl.ypp" + { + idl_global->set_parse_state (IDL_GlobalData::PS_ExceptDeclSeen); } -#line 3783 "fe/idl.tab.cpp" +#line 4244 "fe/idl.tab.cpp" break; case 126: -#line 1562 "fe/idl.ypp" - { +#line 1605 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3791 "fe/idl.tab.cpp" +#line 4252 "fe/idl.tab.cpp" break; case 127: -#line 1566 "fe/idl.ypp" - { - idl_global->set_parse_state (IDL_GlobalData::PS_OpDeclSeen); +#line 1609 "fe/idl.ypp" + { + idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 3799 "fe/idl.tab.cpp" +#line 4260 "fe/idl.tab.cpp" break; case 128: -#line 1570 "fe/idl.ypp" - { +#line 1613 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3807 "fe/idl.tab.cpp" +#line 4268 "fe/idl.tab.cpp" break; case 129: -#line 1574 "fe/idl.ypp" - { - idl_global->err()->syntax_error (idl_global->parse_state()); +#line 1617 "fe/idl.ypp" + { + idl_global->set_parse_state (IDL_GlobalData::PS_OpDeclSeen); } -#line 3815 "fe/idl.tab.cpp" +#line 4276 "fe/idl.tab.cpp" break; case 130: -#line 1578 "fe/idl.ypp" - { +#line 1621 "fe/idl.ypp" + { + idl_global->set_parse_state (IDL_GlobalData::PS_NoState); + } +#line 4284 "fe/idl.tab.cpp" + break; + + case 131: +#line 1625 "fe/idl.ypp" + { + idl_global->err ()->syntax_error (idl_global->parse_state ()); + } +#line 4292 "fe/idl.tab.cpp" + break; + + case 132: +#line 1629 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); yyerrok; (yyval.dcval) = 0; } -#line 3825 "fe/idl.tab.cpp" +#line 4302 "fe/idl.tab.cpp" break; - case 131: -#line 1587 "fe/idl.ypp" - { + case 133: +#line 1638 "fe/idl.ypp" + { ACE_NEW_RETURN ((yyval.nlval), UTL_NameList ((yyvsp[-1].idlist), (yyvsp[0].nlval)), 1); } -#line 3836 "fe/idl.tab.cpp" +#line 4313 "fe/idl.tab.cpp" break; - case 132: -#line 1598 "fe/idl.ypp" - { + case 134: +#line 1649 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_SNListCommaSeen); } -#line 3844 "fe/idl.tab.cpp" +#line 4321 "fe/idl.tab.cpp" break; - case 133: -#line 1602 "fe/idl.ypp" - { + case 135: +#line 1653 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ScopedNameSeen); UTL_NameList *nl = 0; @@ -3864,20 +4341,20 @@ yyreduce: (yyval.nlval) = (yyvsp[-3].nlval); } } -#line 3868 "fe/idl.tab.cpp" +#line 4345 "fe/idl.tab.cpp" break; - case 134: -#line 1622 "fe/idl.ypp" - { + case 136: +#line 1673 "fe/idl.ypp" + { (yyval.nlval) = 0; } -#line 3876 "fe/idl.tab.cpp" +#line 4353 "fe/idl.tab.cpp" break; - case 135: -#line 1629 "fe/idl.ypp" - { + case 137: +#line 1680 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_SN_IDSeen); ACE_NEW_RETURN ((yyval.idlist), @@ -3885,20 +4362,20 @@ yyreduce: 0), 1); } -#line 3889 "fe/idl.tab.cpp" +#line 4366 "fe/idl.tab.cpp" break; - case 136: -#line 1638 "fe/idl.ypp" - { + case 138: +#line 1689 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ScopeDelimSeen); } -#line 3897 "fe/idl.tab.cpp" +#line 4374 "fe/idl.tab.cpp" break; - case 137: -#line 1642 "fe/idl.ypp" - { + case 139: +#line 1693 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_SN_IDSeen); Identifier *id = 0; @@ -3917,12 +4394,12 @@ yyreduce: sn), 1); } -#line 3921 "fe/idl.tab.cpp" +#line 4398 "fe/idl.tab.cpp" break; - case 138: -#line 1663 "fe/idl.ypp" - { + case 140: +#line 1714 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ScopeDelimSeen); // This cleans up all the non-global "::"s in scoped names. @@ -3931,12 +4408,12 @@ yyreduce: ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; } -#line 3935 "fe/idl.tab.cpp" +#line 4412 "fe/idl.tab.cpp" break; - case 139: -#line 1673 "fe/idl.ypp" - { + case 141: +#line 1724 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_SN_IDSeen); UTL_IdList *sn = 0; @@ -3947,36 +4424,36 @@ yyreduce: (yyvsp[-3].idlist)->nconc (sn); (yyval.idlist) = (yyvsp[-3].idlist); } -#line 3951 "fe/idl.tab.cpp" +#line 4428 "fe/idl.tab.cpp" break; - case 140: -#line 1687 "fe/idl.ypp" - { + case 142: +#line 1738 "fe/idl.ypp" + { ACE_NEW_RETURN ((yyval.idval), Identifier ((yyvsp[0].strval)), 1); ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; } -#line 3963 "fe/idl.tab.cpp" +#line 4440 "fe/idl.tab.cpp" break; - case 141: -#line 1697 "fe/idl.ypp" - { + case 143: +#line 1748 "fe/idl.ypp" + { /* defining_id is a defining identifier whereas id is usually a reference to a defining identifier */ ACE_NEW_RETURN ((yyval.idval), Identifier ((yyvsp[0].strval)), 1); ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; } -#line 3975 "fe/idl.tab.cpp" +#line 4452 "fe/idl.tab.cpp" break; - case 142: -#line 1708 "fe/idl.ypp" - { + case 144: +#line 1759 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); @@ -4018,12 +4495,12 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 4022 "fe/idl.tab.cpp" +#line 4499 "fe/idl.tab.cpp" break; - case 143: -#line 1752 "fe/idl.ypp" - { + case 145: +#line 1803 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); @@ -4048,12 +4525,12 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 4052 "fe/idl.tab.cpp" +#line 4529 "fe/idl.tab.cpp" break; - case 144: -#line 1779 "fe/idl.ypp" - { + case 146: +#line 1830 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); @@ -4078,46 +4555,46 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; - (yyval.dcval) = dynamic_cast<AST_Decl*>(f); + (yyval.dcval) = dynamic_cast<AST_Decl *> (f); } -#line 4084 "fe/idl.tab.cpp" +#line 4561 "fe/idl.tab.cpp" break; - case 145: -#line 1810 "fe/idl.ypp" - { + case 147: +#line 1861 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ConstSeen); } -#line 4092 "fe/idl.tab.cpp" +#line 4569 "fe/idl.tab.cpp" break; - case 146: -#line 1814 "fe/idl.ypp" - { + case 148: +#line 1865 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ConstTypeSeen); } -#line 4100 "fe/idl.tab.cpp" +#line 4577 "fe/idl.tab.cpp" break; - case 147: -#line 1818 "fe/idl.ypp" - { + case 149: +#line 1869 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ConstIDSeen); } -#line 4108 "fe/idl.tab.cpp" +#line 4585 "fe/idl.tab.cpp" break; - case 148: -#line 1822 "fe/idl.ypp" - { + case 150: +#line 1873 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ConstAssignSeen); } -#line 4116 "fe/idl.tab.cpp" +#line 4593 "fe/idl.tab.cpp" break; - case 149: -#line 1826 "fe/idl.ypp" - { + case 151: +#line 1877 "fe/idl.ypp" + { (yyval.dcval) = 0; UTL_ScopedName n ((yyvsp[-4].idval), 0); @@ -4172,28 +4649,28 @@ yyreduce: delete (yyvsp[-4].idval); (yyvsp[-4].idval) = 0; } -#line 4176 "fe/idl.tab.cpp" +#line 4653 "fe/idl.tab.cpp" break; - case 156: -#line 1891 "fe/idl.ypp" - { + case 158: +#line 1942 "fe/idl.ypp" + { (yyval.etval) = AST_Expression::EV_string; } -#line 4184 "fe/idl.tab.cpp" +#line 4661 "fe/idl.tab.cpp" break; - case 157: -#line 1895 "fe/idl.ypp" - { + case 159: +#line 1946 "fe/idl.ypp" + { (yyval.etval) = AST_Expression::EV_wstring; } -#line 4192 "fe/idl.tab.cpp" +#line 4669 "fe/idl.tab.cpp" break; - case 158: -#line 1899 "fe/idl.ypp" - { + case 160: +#line 1950 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_PredefinedType *c = 0; AST_Typedef *t = 0; @@ -4258,12 +4735,12 @@ yyreduce: sn = 0; (yyvsp[0].idlist) = 0; } -#line 4262 "fe/idl.tab.cpp" +#line 4739 "fe/idl.tab.cpp" break; - case 162: -#line 1972 "fe/idl.ypp" - { + case 164: +#line 2023 "fe/idl.ypp" + { (yyval.exval) = idl_global->gen ()->create_expr ( AST_Expression::EC_or, @@ -4271,12 +4748,12 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4275 "fe/idl.tab.cpp" +#line 4752 "fe/idl.tab.cpp" break; - case 164: -#line 1985 "fe/idl.ypp" - { + case 166: +#line 2036 "fe/idl.ypp" + { (yyval.exval) = idl_global->gen ()->create_expr ( AST_Expression::EC_xor, @@ -4284,12 +4761,12 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4288 "fe/idl.tab.cpp" +#line 4765 "fe/idl.tab.cpp" break; - case 166: -#line 1998 "fe/idl.ypp" - { + case 168: +#line 2049 "fe/idl.ypp" + { (yyval.exval) = idl_global->gen ()->create_expr ( AST_Expression::EC_and, @@ -4297,12 +4774,12 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4301 "fe/idl.tab.cpp" +#line 4778 "fe/idl.tab.cpp" break; - case 168: -#line 2011 "fe/idl.ypp" - { + case 170: +#line 2062 "fe/idl.ypp" + { (yyval.exval) = idl_global->gen ()->create_expr ( AST_Expression::EC_left, @@ -4310,12 +4787,12 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4314 "fe/idl.tab.cpp" +#line 4791 "fe/idl.tab.cpp" break; - case 169: -#line 2020 "fe/idl.ypp" - { + case 171: +#line 2071 "fe/idl.ypp" + { (yyval.exval) = idl_global->gen ()->create_expr ( AST_Expression::EC_right, @@ -4323,12 +4800,12 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4327 "fe/idl.tab.cpp" +#line 4804 "fe/idl.tab.cpp" break; - case 171: -#line 2033 "fe/idl.ypp" - { + case 173: +#line 2084 "fe/idl.ypp" + { (yyval.exval) = idl_global->gen ()->create_expr ( AST_Expression::EC_add, @@ -4336,12 +4813,12 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4340 "fe/idl.tab.cpp" +#line 4817 "fe/idl.tab.cpp" break; - case 172: -#line 2042 "fe/idl.ypp" - { + case 174: +#line 2093 "fe/idl.ypp" + { (yyval.exval) = idl_global->gen ()->create_expr ( AST_Expression::EC_minus, @@ -4349,12 +4826,12 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4353 "fe/idl.tab.cpp" +#line 4830 "fe/idl.tab.cpp" break; - case 174: -#line 2055 "fe/idl.ypp" - { + case 176: +#line 2106 "fe/idl.ypp" + { (yyval.exval) = idl_global->gen ()->create_expr ( AST_Expression::EC_mul, @@ -4362,12 +4839,12 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4366 "fe/idl.tab.cpp" +#line 4843 "fe/idl.tab.cpp" break; - case 175: -#line 2064 "fe/idl.ypp" - { + case 177: +#line 2115 "fe/idl.ypp" + { (yyval.exval) = idl_global->gen ()->create_expr ( AST_Expression::EC_div, @@ -4375,12 +4852,12 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4379 "fe/idl.tab.cpp" +#line 4856 "fe/idl.tab.cpp" break; - case 176: -#line 2073 "fe/idl.ypp" - { + case 178: +#line 2124 "fe/idl.ypp" + { (yyval.exval) = idl_global->gen ()->create_expr ( AST_Expression::EC_mod, @@ -4388,12 +4865,12 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4392 "fe/idl.tab.cpp" +#line 4869 "fe/idl.tab.cpp" break; - case 178: -#line 2086 "fe/idl.ypp" - { + case 180: +#line 2137 "fe/idl.ypp" + { (yyval.exval) = idl_global->gen ()->create_expr ( AST_Expression::EC_u_plus, @@ -4401,38 +4878,38 @@ yyreduce: 0 ); } -#line 4405 "fe/idl.tab.cpp" +#line 4882 "fe/idl.tab.cpp" break; - case 179: -#line 2095 "fe/idl.ypp" - { + case 181: +#line 2146 "fe/idl.ypp" + { (yyval.exval) = - idl_global->gen()->create_expr ( + idl_global->gen ()->create_expr ( AST_Expression::EC_u_minus, (yyvsp[0].exval), 0 ); } -#line 4418 "fe/idl.tab.cpp" +#line 4895 "fe/idl.tab.cpp" break; - case 180: -#line 2104 "fe/idl.ypp" - { + case 182: +#line 2155 "fe/idl.ypp" + { (yyval.exval) = - idl_global->gen()->create_expr ( + idl_global->gen ()->create_expr ( AST_Expression::EC_bit_neg, (yyvsp[0].exval), 0 ); } -#line 4431 "fe/idl.tab.cpp" +#line 4908 "fe/idl.tab.cpp" break; - case 181: -#line 2116 "fe/idl.ypp" - { + case 183: +#line 2167 "fe/idl.ypp" + { UTL_ScopedName *name = (yyvsp[0].idlist); /* @@ -4488,108 +4965,108 @@ yyreduce: delete name; (yyvsp[0].idlist) = name = 0; } -#line 4492 "fe/idl.tab.cpp" +#line 4969 "fe/idl.tab.cpp" break; - case 183: -#line 2174 "fe/idl.ypp" - { + case 185: +#line 2225 "fe/idl.ypp" + { (yyval.exval) = (yyvsp[-1].exval); } -#line 4500 "fe/idl.tab.cpp" +#line 4977 "fe/idl.tab.cpp" break; - case 184: -#line 2181 "fe/idl.ypp" - { + case 186: +#line 2232 "fe/idl.ypp" + { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].ival)); } -#line 4508 "fe/idl.tab.cpp" +#line 4985 "fe/idl.tab.cpp" break; - case 185: -#line 2185 "fe/idl.ypp" - { + case 187: +#line 2236 "fe/idl.ypp" + { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].uival)); } -#line 4517 "fe/idl.tab.cpp" +#line 4994 "fe/idl.tab.cpp" break; - case 186: -#line 2190 "fe/idl.ypp" - { + case 188: +#line 2241 "fe/idl.ypp" + { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].sval)); (yyvsp[0].sval)->destroy (); delete (yyvsp[0].sval); (yyvsp[0].sval) = 0; } -#line 4528 "fe/idl.tab.cpp" +#line 5005 "fe/idl.tab.cpp" break; - case 187: -#line 2197 "fe/idl.ypp" - { + case 189: +#line 2248 "fe/idl.ypp" + { char *wide_string = (yyvsp[0].wsval); (yyval.exval) = idl_global->gen ()->create_expr (wide_string); ACE_OS::free (wide_string); (yyvsp[0].wsval) = 0; } -#line 4539 "fe/idl.tab.cpp" +#line 5016 "fe/idl.tab.cpp" break; - case 188: -#line 2204 "fe/idl.ypp" - { + case 190: +#line 2255 "fe/idl.ypp" + { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].cval)); } -#line 4547 "fe/idl.tab.cpp" +#line 5024 "fe/idl.tab.cpp" break; - case 189: -#line 2208 "fe/idl.ypp" - { + case 191: +#line 2259 "fe/idl.ypp" + { ACE_OutputCDR::from_wchar wc ((yyvsp[0].wcval)); (yyval.exval) = idl_global->gen ()->create_expr (wc); } -#line 4556 "fe/idl.tab.cpp" +#line 5033 "fe/idl.tab.cpp" break; - case 190: -#line 2213 "fe/idl.ypp" - { + case 192: +#line 2264 "fe/idl.ypp" + { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].fixval)); } -#line 4564 "fe/idl.tab.cpp" +#line 5041 "fe/idl.tab.cpp" break; - case 191: -#line 2217 "fe/idl.ypp" - { + case 193: +#line 2268 "fe/idl.ypp" + { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].dval)); } -#line 4572 "fe/idl.tab.cpp" +#line 5049 "fe/idl.tab.cpp" break; - case 192: -#line 2221 "fe/idl.ypp" - { + case 194: +#line 2272 "fe/idl.ypp" + { (yyval.exval) = idl_global->gen ()->create_expr (true); } -#line 4580 "fe/idl.tab.cpp" +#line 5057 "fe/idl.tab.cpp" break; - case 193: -#line 2225 "fe/idl.ypp" - { + case 195: +#line 2276 "fe/idl.ypp" + { (yyval.exval) = idl_global->gen ()->create_expr (false); } -#line 4588 "fe/idl.tab.cpp" +#line 5065 "fe/idl.tab.cpp" break; - case 194: -#line 2232 "fe/idl.ypp" - { + case 196: +#line 2283 "fe/idl.ypp" + { int good_expression = 1; (yyvsp[0].exval)->evaluate (AST_Expression::EK_positive_int); AST_Expression::AST_ExprValue *ev = (yyvsp[0].exval)->ev (); @@ -4653,12 +5130,12 @@ yyreduce: idl_global->err ()->syntax_error (idl_global->parse_state ()); } } -#line 4657 "fe/idl.tab.cpp" +#line 5134 "fe/idl.tab.cpp" break; - case 195: -#line 2300 "fe/idl.ypp" - { + case 197: +#line 2351 "fe/idl.ypp" + { if (idl_global->idl_version_ < IDL_VERSION_4) { idl_global->err ()->idl_version_error ( @@ -4674,12 +5151,12 @@ yyreduce: fe_add_annotation_decl (annotation_decl); idl_global->scopes ().push (annotation_decl); } -#line 4678 "fe/idl.tab.cpp" +#line 5155 "fe/idl.tab.cpp" break; - case 196: -#line 2317 "fe/idl.ypp" - { + case 198: +#line 2368 "fe/idl.ypp" + { Identifier *id = (yyvsp[-4].idval); idl_global->scopes ().pop (); id->destroy (); @@ -4687,21 +5164,21 @@ yyreduce: (yyval.dcval) = 0; } -#line 4691 "fe/idl.tab.cpp" +#line 5168 "fe/idl.tab.cpp" break; - case 202: -#line 2337 "fe/idl.ypp" - { + case 204: +#line 2388 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_TypedefSeen); idl_global->in_typedef (true); } -#line 4700 "fe/idl.tab.cpp" +#line 5177 "fe/idl.tab.cpp" break; - case 206: -#line 2351 "fe/idl.ypp" - { + case 208: +#line 2402 "fe/idl.ypp" + { UTL_Scope *scope = idl_global->scopes ().top_non_null (); UTL_Scope *root = idl_global->scopes ().bottom (); @@ -4753,28 +5230,28 @@ yyreduce: delete result; } } -#line 4757 "fe/idl.tab.cpp" +#line 5234 "fe/idl.tab.cpp" break; - case 207: -#line 2407 "fe/idl.ypp" - { + case 209: +#line 2458 "fe/idl.ypp" + { (yyval.exval) = (yyvsp[0].exval); } -#line 4765 "fe/idl.tab.cpp" +#line 5242 "fe/idl.tab.cpp" break; - case 208: -#line 2411 "fe/idl.ypp" - { + case 210: +#line 2462 "fe/idl.ypp" + { (yyval.exval) = 0; } -#line 4773 "fe/idl.tab.cpp" +#line 5250 "fe/idl.tab.cpp" break; - case 209: -#line 2418 "fe/idl.ypp" - { + case 211: +#line 2469 "fe/idl.ypp" + { AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val); AST_Annotation_Appl *annotation = (yyvsp[0].annotation_val); if (annotation) @@ -4783,12 +5260,12 @@ yyreduce: } (yyval.annotations_val) = annotations; } -#line 4787 "fe/idl.tab.cpp" +#line 5264 "fe/idl.tab.cpp" break; - case 210: -#line 2431 "fe/idl.ypp" - { + case 212: +#line 2482 "fe/idl.ypp" + { AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val); AST_Annotation_Appl *annotation = (yyvsp[0].annotation_val); if (annotation) @@ -4797,20 +5274,20 @@ yyreduce: } (yyval.annotations_val) = annotations; } -#line 4801 "fe/idl.tab.cpp" +#line 5278 "fe/idl.tab.cpp" break; - case 211: -#line 2441 "fe/idl.ypp" - { + case 213: +#line 2492 "fe/idl.ypp" + { (yyval.annotations_val) = new AST_Annotation_Appls (); } -#line 4809 "fe/idl.tab.cpp" +#line 5286 "fe/idl.tab.cpp" break; - case 212: -#line 2448 "fe/idl.ypp" - { + case 214: +#line 2499 "fe/idl.ypp" + { if (idl_global->idl_version_ < IDL_VERSION_4) { idl_global->err ()->idl_version_error ( @@ -4866,12 +5343,12 @@ yyreduce: (yyval.annotation_decl_val) = decl; } -#line 4870 "fe/idl.tab.cpp" +#line 5347 "fe/idl.tab.cpp" break; - case 213: -#line 2505 "fe/idl.ypp" - { + case 215: +#line 2556 "fe/idl.ypp" + { idl_global->ignore_lookup_errors_ = false; stack_based_lookup_for_primary_expr = false; AST_Annotation_Appl *appl = 0; @@ -4898,28 +5375,28 @@ yyreduce: (yyval.annotation_val) = appl; } -#line 4902 "fe/idl.tab.cpp" +#line 5379 "fe/idl.tab.cpp" break; - case 214: -#line 2536 "fe/idl.ypp" - { + case 216: +#line 2587 "fe/idl.ypp" + { (yyval.annotation_params_val) = (yyvsp[-1].annotation_params_val); } -#line 4910 "fe/idl.tab.cpp" +#line 5387 "fe/idl.tab.cpp" break; - case 215: -#line 2540 "fe/idl.ypp" - { + case 217: +#line 2591 "fe/idl.ypp" + { (yyval.annotation_params_val) = 0; } -#line 4918 "fe/idl.tab.cpp" +#line 5395 "fe/idl.tab.cpp" break; - case 216: -#line 2547 "fe/idl.ypp" - { + case 218: +#line 2598 "fe/idl.ypp" + { AST_Annotation_Appl::Params *params = new AST_Annotation_Appl::Params; AST_Annotation_Appl::Param *param = new AST_Annotation_Appl::Param; param->id = 0; @@ -4927,48 +5404,48 @@ yyreduce: params->push (param); (yyval.annotation_params_val) = params; } -#line 4931 "fe/idl.tab.cpp" +#line 5408 "fe/idl.tab.cpp" break; - case 217: -#line 2556 "fe/idl.ypp" - { + case 219: +#line 2607 "fe/idl.ypp" + { (yyval.annotation_params_val) = (yyvsp[0].annotation_params_val); } -#line 4939 "fe/idl.tab.cpp" +#line 5416 "fe/idl.tab.cpp" break; - case 218: -#line 2563 "fe/idl.ypp" - { + case 220: +#line 2614 "fe/idl.ypp" + { AST_Annotation_Appl::Params *params = (yyvsp[0].annotation_params_val); params->push ((yyvsp[-1].annotation_param_val)); (yyval.annotation_params_val) = params; } -#line 4949 "fe/idl.tab.cpp" +#line 5426 "fe/idl.tab.cpp" break; - case 219: -#line 2571 "fe/idl.ypp" - { + case 221: +#line 2622 "fe/idl.ypp" + { AST_Annotation_Appl::Params *params = (yyvsp[0].annotation_params_val); params->push ((yyvsp[-1].annotation_param_val)); (yyval.annotation_params_val) = params; } -#line 4959 "fe/idl.tab.cpp" +#line 5436 "fe/idl.tab.cpp" break; - case 220: -#line 2577 "fe/idl.ypp" - { + case 222: +#line 2628 "fe/idl.ypp" + { (yyval.annotation_params_val) = new AST_Annotation_Appl::Params; } -#line 4967 "fe/idl.tab.cpp" +#line 5444 "fe/idl.tab.cpp" break; - case 221: -#line 2584 "fe/idl.ypp" - { + case 223: +#line 2635 "fe/idl.ypp" + { AST_Annotation_Appl::Param *param = new AST_Annotation_Appl::Param; param->id = (yyvsp[-2].idval); // Annotation Member Names Can't Clash with C++ keywords @@ -4976,53 +5453,53 @@ yyreduce: param->expr = (yyvsp[0].exval); (yyval.annotation_param_val) = param; } -#line 4980 "fe/idl.tab.cpp" +#line 5457 "fe/idl.tab.cpp" break; - case 222: -#line 2596 "fe/idl.ypp" - { + case 224: +#line 2647 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_TypedefSeen); idl_global->in_typedef (true); } -#line 4989 "fe/idl.tab.cpp" +#line 5466 "fe/idl.tab.cpp" break; - case 223: -#line 2601 "fe/idl.ypp" - { + case 225: +#line 2652 "fe/idl.ypp" + { (yyval.dcval) = (yyvsp[0].dcval); } -#line 4997 "fe/idl.tab.cpp" +#line 5474 "fe/idl.tab.cpp" break; - case 224: -#line 2605 "fe/idl.ypp" - { + case 226: +#line 2656 "fe/idl.ypp" + { (yyval.dcval) = (yyvsp[0].dcval); } -#line 5005 "fe/idl.tab.cpp" +#line 5482 "fe/idl.tab.cpp" break; - case 225: -#line 2609 "fe/idl.ypp" - { + case 227: +#line 2660 "fe/idl.ypp" + { (yyval.dcval) = (yyvsp[0].dcval); } -#line 5013 "fe/idl.tab.cpp" +#line 5490 "fe/idl.tab.cpp" break; - case 226: -#line 2613 "fe/idl.ypp" - { + case 228: +#line 2664 "fe/idl.ypp" + { (yyval.dcval) = (yyvsp[0].dcval); } -#line 5021 "fe/idl.tab.cpp" +#line 5498 "fe/idl.tab.cpp" break; - case 227: -#line 2617 "fe/idl.ypp" - { + case 229: +#line 2668 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Native *node = 0; idl_global->set_parse_state (IDL_GlobalData::PS_NativeSeen); @@ -5049,28 +5526,28 @@ yyreduce: (yyval.dcval) = 0; } -#line 5053 "fe/idl.tab.cpp" +#line 5530 "fe/idl.tab.cpp" break; - case 228: -#line 2645 "fe/idl.ypp" - { + case 230: +#line 2696 "fe/idl.ypp" + { (yyval.dcval) = 0; } -#line 5061 "fe/idl.tab.cpp" +#line 5538 "fe/idl.tab.cpp" break; - case 229: -#line 2652 "fe/idl.ypp" - { + case 231: +#line 2703 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_TypeSpecSeen); } -#line 5069 "fe/idl.tab.cpp" +#line 5546 "fe/idl.tab.cpp" break; - case 230: -#line 2656 "fe/idl.ypp" - { + case 232: +#line 2707 "fe/idl.ypp" + { AST_Decl *type_spec = (yyvsp[-2].dcval); UTL_DeclList *decls = (yyvsp[0].dlval); @@ -5133,23 +5610,23 @@ yyreduce: (yyval.dcval) = t; } -#line 5137 "fe/idl.tab.cpp" +#line 5614 "fe/idl.tab.cpp" break; - case 233: -#line 2728 "fe/idl.ypp" - { + case 235: +#line 2779 "fe/idl.ypp" + { (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ( (yyvsp[0].etval) ); } -#line 5148 "fe/idl.tab.cpp" +#line 5625 "fe/idl.tab.cpp" break; - case 235: -#line 2736 "fe/idl.ypp" - { + case 237: +#line 2787 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = 0; @@ -5171,31 +5648,31 @@ yyreduce: (yyval.dcval) = d; } -#line 5175 "fe/idl.tab.cpp" +#line 5652 "fe/idl.tab.cpp" break; - case 253: -#line 2791 "fe/idl.ypp" - { + case 255: +#line 2842 "fe/idl.ypp" + { ACE_NEW_RETURN ((yyval.dlval), UTL_DeclList ((yyvsp[-1].deval), (yyvsp[0].dlval)), 1); } -#line 5186 "fe/idl.tab.cpp" +#line 5663 "fe/idl.tab.cpp" break; - case 254: -#line 2802 "fe/idl.ypp" - { + case 256: +#line 2853 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_DeclsCommaSeen); } -#line 5194 "fe/idl.tab.cpp" +#line 5671 "fe/idl.tab.cpp" break; - case 255: -#line 2806 "fe/idl.ypp" - { + case 257: +#line 2857 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_DeclsDeclSeen); UTL_DeclList *dl = 0; @@ -5214,39 +5691,39 @@ yyreduce: (yyval.dlval) = (yyvsp[-3].dlval); } } -#line 5218 "fe/idl.tab.cpp" +#line 5695 "fe/idl.tab.cpp" break; - case 256: -#line 2826 "fe/idl.ypp" - { + case 258: +#line 2877 "fe/idl.ypp" + { (yyval.dlval) = 0; } -#line 5226 "fe/idl.tab.cpp" +#line 5703 "fe/idl.tab.cpp" break; - case 259: -#line 2838 "fe/idl.ypp" - { + case 261: +#line 2889 "fe/idl.ypp" + { ACE_NEW_RETURN ((yyval.dlval), UTL_DeclList ((yyvsp[-1].deval), (yyvsp[0].dlval)), 1); } -#line 5237 "fe/idl.tab.cpp" +#line 5714 "fe/idl.tab.cpp" break; - case 260: -#line 2849 "fe/idl.ypp" - { + case 262: +#line 2900 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_DeclsCommaSeen); } -#line 5245 "fe/idl.tab.cpp" +#line 5722 "fe/idl.tab.cpp" break; - case 261: -#line 2853 "fe/idl.ypp" - { + case 263: +#line 2904 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_DeclsDeclSeen); UTL_DeclList *dl = 0; @@ -5265,20 +5742,20 @@ yyreduce: (yyval.dlval) = (yyvsp[-3].dlval); } } -#line 5269 "fe/idl.tab.cpp" +#line 5746 "fe/idl.tab.cpp" break; - case 262: -#line 2873 "fe/idl.ypp" - { + case 264: +#line 2924 "fe/idl.ypp" + { (yyval.dlval) = 0; } -#line 5277 "fe/idl.tab.cpp" +#line 5754 "fe/idl.tab.cpp" break; - case 263: -#line 2880 "fe/idl.ypp" - { + case 265: +#line 2931 "fe/idl.ypp" + { UTL_ScopedName *sn = 0; ACE_NEW_RETURN (sn, UTL_ScopedName ((yyvsp[0].idval), @@ -5290,12 +5767,12 @@ yyreduce: 0), 1); } -#line 5294 "fe/idl.tab.cpp" +#line 5771 "fe/idl.tab.cpp" break; - case 264: -#line 2896 "fe/idl.ypp" - { + case 266: +#line 2947 "fe/idl.ypp" + { UTL_ScopedName *sn = 0; ACE_NEW_RETURN (sn, UTL_ScopedName ( @@ -5309,157 +5786,157 @@ yyreduce: (yyvsp[0].dcval)), 1); } -#line 5313 "fe/idl.tab.cpp" +#line 5790 "fe/idl.tab.cpp" break; - case 267: -#line 2919 "fe/idl.ypp" - { + case 269: +#line 2970 "fe/idl.ypp" + { (yyval.etval) = AST_Expression::EV_long; } -#line 5321 "fe/idl.tab.cpp" +#line 5798 "fe/idl.tab.cpp" break; - case 268: -#line 2923 "fe/idl.ypp" - { + case 270: +#line 2974 "fe/idl.ypp" + { (yyval.etval) = AST_Expression::EV_longlong; } -#line 5329 "fe/idl.tab.cpp" +#line 5806 "fe/idl.tab.cpp" break; - case 269: -#line 2927 "fe/idl.ypp" - { + case 271: +#line 2978 "fe/idl.ypp" + { (yyval.etval) = AST_Expression::EV_short; } -#line 5337 "fe/idl.tab.cpp" +#line 5814 "fe/idl.tab.cpp" break; - case 270: -#line 2934 "fe/idl.ypp" - { + case 272: +#line 2985 "fe/idl.ypp" + { (yyval.etval) = AST_Expression::EV_ulong; } -#line 5345 "fe/idl.tab.cpp" +#line 5822 "fe/idl.tab.cpp" break; - case 271: -#line 2938 "fe/idl.ypp" - { + case 273: +#line 2989 "fe/idl.ypp" + { (yyval.etval) = AST_Expression::EV_ulonglong; } -#line 5353 "fe/idl.tab.cpp" +#line 5830 "fe/idl.tab.cpp" break; - case 272: -#line 2942 "fe/idl.ypp" - { + case 274: +#line 2993 "fe/idl.ypp" + { (yyval.etval) = AST_Expression::EV_ushort; } -#line 5361 "fe/idl.tab.cpp" +#line 5838 "fe/idl.tab.cpp" break; - case 273: -#line 2949 "fe/idl.ypp" - { + case 275: +#line 3000 "fe/idl.ypp" + { (yyval.etval) = AST_Expression::EV_double; } -#line 5369 "fe/idl.tab.cpp" +#line 5846 "fe/idl.tab.cpp" break; - case 274: -#line 2953 "fe/idl.ypp" - { + case 276: +#line 3004 "fe/idl.ypp" + { (yyval.etval) = AST_Expression::EV_float; } -#line 5377 "fe/idl.tab.cpp" +#line 5854 "fe/idl.tab.cpp" break; - case 275: -#line 2957 "fe/idl.ypp" - { + case 277: +#line 3008 "fe/idl.ypp" + { (yyval.etval) = AST_Expression::EV_longdouble; } -#line 5385 "fe/idl.tab.cpp" +#line 5862 "fe/idl.tab.cpp" break; - case 276: -#line 2964 "fe/idl.ypp" - { + case 278: +#line 3015 "fe/idl.ypp" + { (yyval.etval) = AST_Expression::EV_fixed; } -#line 5393 "fe/idl.tab.cpp" +#line 5870 "fe/idl.tab.cpp" break; - case 277: -#line 2971 "fe/idl.ypp" - { + case 279: +#line 3022 "fe/idl.ypp" + { (yyval.etval) = AST_Expression::EV_char; } -#line 5401 "fe/idl.tab.cpp" +#line 5878 "fe/idl.tab.cpp" break; - case 278: -#line 2975 "fe/idl.ypp" - { + case 280: +#line 3026 "fe/idl.ypp" + { (yyval.etval) = AST_Expression::EV_wchar; } -#line 5409 "fe/idl.tab.cpp" +#line 5886 "fe/idl.tab.cpp" break; - case 279: -#line 2982 "fe/idl.ypp" - { + case 281: +#line 3033 "fe/idl.ypp" + { (yyval.etval) = AST_Expression::EV_octet; } -#line 5417 "fe/idl.tab.cpp" +#line 5894 "fe/idl.tab.cpp" break; - case 280: -#line 2989 "fe/idl.ypp" - { + case 282: +#line 3040 "fe/idl.ypp" + { (yyval.etval) = AST_Expression::EV_bool; } -#line 5425 "fe/idl.tab.cpp" +#line 5902 "fe/idl.tab.cpp" break; - case 281: -#line 2996 "fe/idl.ypp" - { + case 283: +#line 3047 "fe/idl.ypp" + { (yyval.etval) = AST_Expression::EV_any; } -#line 5433 "fe/idl.tab.cpp" +#line 5910 "fe/idl.tab.cpp" break; - case 282: -#line 3003 "fe/idl.ypp" - { + case 284: +#line 3054 "fe/idl.ypp" + { (yyval.etval) = AST_Expression::EV_object; } -#line 5441 "fe/idl.tab.cpp" +#line 5918 "fe/idl.tab.cpp" break; - case 283: -#line 3010 "fe/idl.ypp" - { + case 285: +#line 3061 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_StructSeen); } -#line 5449 "fe/idl.tab.cpp" +#line 5926 "fe/idl.tab.cpp" break; - case 284: -#line 3014 "fe/idl.ypp" - { + case 286: +#line 3065 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_StructIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 5458 "fe/idl.tab.cpp" +#line 5935 "fe/idl.tab.cpp" break; - case 285: -#line 3023 "fe/idl.ypp" - { + case 287: +#line 3074 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); AST_Structure *d = 0; @@ -5489,28 +5966,28 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 5493 "fe/idl.tab.cpp" +#line 5970 "fe/idl.tab.cpp" break; - case 286: -#line 3054 "fe/idl.ypp" - { + case 288: +#line 3105 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_StructSqSeen); } -#line 5501 "fe/idl.tab.cpp" +#line 5978 "fe/idl.tab.cpp" break; - case 287: -#line 3058 "fe/idl.ypp" - { + case 289: +#line 3109 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_StructBodySeen); } -#line 5509 "fe/idl.tab.cpp" +#line 5986 "fe/idl.tab.cpp" break; - case 288: -#line 3062 "fe/idl.ypp" - { + case 290: +#line 3113 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_StructQsSeen); /* @@ -5521,12 +5998,12 @@ yyreduce: ); idl_global->scopes ().pop (); } -#line 5525 "fe/idl.tab.cpp" +#line 6002 "fe/idl.tab.cpp" break; - case 292: -#line 3084 "fe/idl.ypp" - { + case 294: +#line 3135 "fe/idl.ypp" + { AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val); AST_Decls *members = (yyvsp[0].decls_val); if (annotations && members) @@ -5539,28 +6016,28 @@ yyreduce: delete annotations; delete members; } -#line 5543 "fe/idl.tab.cpp" +#line 6020 "fe/idl.tab.cpp" break; - case 293: -#line 3101 "fe/idl.ypp" - { + case 295: +#line 3152 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_MemberTypeSeen); } -#line 5551 "fe/idl.tab.cpp" +#line 6028 "fe/idl.tab.cpp" break; - case 294: -#line 3105 "fe/idl.ypp" - { + case 296: +#line 3156 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_MemberDeclsSeen); } -#line 5559 "fe/idl.tab.cpp" +#line 6036 "fe/idl.tab.cpp" break; - case 295: -#line 3109 "fe/idl.ypp" - { + case 297: +#line 3160 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); FE_Declarator *d = 0; AST_Field *f = 0; @@ -5613,54 +6090,54 @@ yyreduce: (yyval.decls_val) = members; } -#line 5617 "fe/idl.tab.cpp" +#line 6094 "fe/idl.tab.cpp" break; - case 296: -#line 3163 "fe/idl.ypp" - { - idl_global->err()->syntax_error (idl_global->parse_state ()); + case 298: +#line 3214 "fe/idl.ypp" + { + idl_global->err ()->syntax_error (idl_global->parse_state ()); } -#line 5625 "fe/idl.tab.cpp" +#line 6102 "fe/idl.tab.cpp" break; - case 297: -#line 3167 "fe/idl.ypp" - { + case 299: +#line 3218 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); yyerrok; } -#line 5634 "fe/idl.tab.cpp" +#line 6111 "fe/idl.tab.cpp" break; - case 298: -#line 3175 "fe/idl.ypp" - { + case 300: +#line 3226 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_UnionSeen); } -#line 5642 "fe/idl.tab.cpp" +#line 6119 "fe/idl.tab.cpp" break; - case 299: -#line 3179 "fe/idl.ypp" - { + case 301: +#line 3230 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_UnionIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 5651 "fe/idl.tab.cpp" +#line 6128 "fe/idl.tab.cpp" break; - case 300: -#line 3187 "fe/idl.ypp" - { + case 302: +#line 3238 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_SwitchSeen); } -#line 5659 "fe/idl.tab.cpp" +#line 6136 "fe/idl.tab.cpp" break; - case 301: -#line 3191 "fe/idl.ypp" - { + case 303: +#line 3242 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[-3].idval), 0); AST_Union *u = 0; @@ -5692,20 +6169,20 @@ yyreduce: * Don't delete $1 yet; we'll need it a bit later. */ } -#line 5696 "fe/idl.tab.cpp" +#line 6173 "fe/idl.tab.cpp" break; - case 302: -#line 3224 "fe/idl.ypp" - { + case 304: +#line 3275 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_SwitchTypeSeen); } -#line 5704 "fe/idl.tab.cpp" +#line 6181 "fe/idl.tab.cpp" break; - case 303: -#line 3228 "fe/idl.ypp" - { + case 305: +#line 3279 "fe/idl.ypp" + { /* * The top of the scopes must be an empty union we added after we * encountered 'union <id> switch ('. Now we are ready to add a @@ -5763,28 +6240,28 @@ yyreduce: delete disc_annotations; } -#line 5767 "fe/idl.tab.cpp" +#line 6244 "fe/idl.tab.cpp" break; - case 304: -#line 3287 "fe/idl.ypp" - { + case 306: +#line 3338 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_UnionSqSeen); } -#line 5775 "fe/idl.tab.cpp" +#line 6252 "fe/idl.tab.cpp" break; - case 305: -#line 3291 "fe/idl.ypp" - { + case 307: +#line 3342 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_UnionBodySeen); } -#line 5783 "fe/idl.tab.cpp" +#line 6260 "fe/idl.tab.cpp" break; - case 306: -#line 3295 "fe/idl.ypp" - { + case 308: +#line 3346 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_UnionQsSeen); /* @@ -5799,23 +6276,23 @@ yyreduce: idl_global->scopes ().pop (); } } -#line 5803 "fe/idl.tab.cpp" +#line 6280 "fe/idl.tab.cpp" break; - case 307: -#line 3314 "fe/idl.ypp" - { + case 309: +#line 3365 "fe/idl.ypp" + { (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ( (yyvsp[0].etval) ); } -#line 5814 "fe/idl.tab.cpp" +#line 6291 "fe/idl.tab.cpp" break; - case 308: -#line 3321 "fe/idl.ypp" - { + case 310: +#line 3372 "fe/idl.ypp" + { /* wchars are not allowed. */ if ((yyvsp[0].etval) == AST_Expression::EV_wchar) { @@ -5827,12 +6304,12 @@ yyreduce: (yyvsp[0].etval) ); } -#line 5831 "fe/idl.tab.cpp" +#line 6308 "fe/idl.tab.cpp" break; - case 309: -#line 3334 "fe/idl.ypp" - { + case 311: +#line 3385 "fe/idl.ypp" + { /* octets are not allowed. */ idl_global->err ()->error0 (UTL_Error::EIDL_DISC_TYPE); (yyval.dcval) = @@ -5840,23 +6317,23 @@ yyreduce: (yyvsp[0].etval) ); } -#line 5844 "fe/idl.tab.cpp" +#line 6321 "fe/idl.tab.cpp" break; - case 310: -#line 3343 "fe/idl.ypp" - { + case 312: +#line 3394 "fe/idl.ypp" + { (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ( (yyvsp[0].etval) ); } -#line 5855 "fe/idl.tab.cpp" +#line 6332 "fe/idl.tab.cpp" break; - case 312: -#line 3351 "fe/idl.ypp" - { + case 314: +#line 3402 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = 0; AST_PredefinedType *p = 0; @@ -5962,28 +6439,28 @@ yyreduce: delete (yyvsp[0].idlist); (yyvsp[0].idlist) = 0; } -#line 5966 "fe/idl.tab.cpp" +#line 6443 "fe/idl.tab.cpp" break; - case 316: -#line 3468 "fe/idl.ypp" - { + case 318: +#line 3519 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_UnionLabelSeen); } -#line 5974 "fe/idl.tab.cpp" +#line 6451 "fe/idl.tab.cpp" break; - case 317: -#line 3472 "fe/idl.ypp" - { + case 319: +#line 3523 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemSeen); } -#line 5982 "fe/idl.tab.cpp" +#line 6459 "fe/idl.tab.cpp" break; - case 318: -#line 3476 "fe/idl.ypp" - { + case 320: +#line 3527 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_UnionBranch *b = 0; AST_Annotation_Appls *annotations = (yyvsp[-3].annotations_val); @@ -6014,40 +6491,40 @@ yyreduce: delete annotations; } -#line 6018 "fe/idl.tab.cpp" +#line 6495 "fe/idl.tab.cpp" break; - case 319: -#line 3508 "fe/idl.ypp" - { - idl_global->err()->syntax_error (idl_global->parse_state()); + case 321: +#line 3559 "fe/idl.ypp" + { + idl_global->err ()->syntax_error (idl_global->parse_state ()); } -#line 6026 "fe/idl.tab.cpp" +#line 6503 "fe/idl.tab.cpp" break; - case 320: -#line 3512 "fe/idl.ypp" - { + case 322: +#line 3563 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); yyerrok; } -#line 6035 "fe/idl.tab.cpp" +#line 6512 "fe/idl.tab.cpp" break; - case 321: -#line 3520 "fe/idl.ypp" - { + case 323: +#line 3571 "fe/idl.ypp" + { ACE_NEW_RETURN ((yyval.llval), UTL_LabelList ((yyvsp[-1].ulval), (yyvsp[0].llval)), 1); } -#line 6046 "fe/idl.tab.cpp" +#line 6523 "fe/idl.tab.cpp" break; - case 322: -#line 3530 "fe/idl.ypp" - { + case 324: +#line 3581 "fe/idl.ypp" + { UTL_LabelList *ll = 0; ACE_NEW_RETURN (ll, UTL_LabelList ((yyvsp[0].ulval), @@ -6064,28 +6541,28 @@ yyreduce: (yyval.llval) = (yyvsp[-1].llval); } } -#line 6068 "fe/idl.tab.cpp" +#line 6545 "fe/idl.tab.cpp" break; - case 323: -#line 3548 "fe/idl.ypp" - { + case 325: +#line 3599 "fe/idl.ypp" + { (yyval.llval) = 0; } -#line 6076 "fe/idl.tab.cpp" +#line 6553 "fe/idl.tab.cpp" break; - case 324: -#line 3555 "fe/idl.ypp" - { + case 326: +#line 3606 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_DefaultSeen); } -#line 6084 "fe/idl.tab.cpp" +#line 6561 "fe/idl.tab.cpp" break; - case 325: -#line 3559 "fe/idl.ypp" - { + case 327: +#line 3610 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_LabelColonSeen); (yyval.ulval) = idl_global->gen ()->create_union_label ( @@ -6093,49 +6570,49 @@ yyreduce: 0 ); } -#line 6097 "fe/idl.tab.cpp" +#line 6574 "fe/idl.tab.cpp" break; - case 326: -#line 3568 "fe/idl.ypp" - { + case 328: +#line 3619 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_CaseSeen); } -#line 6105 "fe/idl.tab.cpp" +#line 6582 "fe/idl.tab.cpp" break; - case 327: -#line 3572 "fe/idl.ypp" - { + case 329: +#line 3623 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_LabelExprSeen); } -#line 6113 "fe/idl.tab.cpp" +#line 6590 "fe/idl.tab.cpp" break; - case 328: -#line 3576 "fe/idl.ypp" - { + case 330: +#line 3627 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_LabelColonSeen); - (yyval.ulval) = idl_global->gen()->create_union_label ( + (yyval.ulval) = idl_global->gen ()->create_union_label ( AST_UnionLabel::UL_label, (yyvsp[-2].exval) ); } -#line 6126 "fe/idl.tab.cpp" +#line 6603 "fe/idl.tab.cpp" break; - case 329: -#line 3588 "fe/idl.ypp" - { + case 331: +#line 3639 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemTypeSeen); } -#line 6134 "fe/idl.tab.cpp" +#line 6611 "fe/idl.tab.cpp" break; - case 330: -#line 3592 "fe/idl.ypp" - { + case 332: +#line 3643 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemDeclSeen); /* @@ -6144,8 +6621,7 @@ yyreduce: if ((yyvsp[-2].dcval) != 0 && AST_illegal_recursive_type ((yyvsp[-2].dcval))) { - idl_global->err()->error1 (UTL_Error::EIDL_RECURSIVE_TYPE, - (yyvsp[-2].dcval)); + idl_global->err ()->error1 (UTL_Error::EIDL_RECURSIVE_TYPE, (yyvsp[-2].dcval)); (yyval.ffval) = 0; } @@ -6178,12 +6654,12 @@ yyreduce: (yyvsp[0].deval) = 0; } } -#line 6182 "fe/idl.tab.cpp" +#line 6658 "fe/idl.tab.cpp" break; - case 331: -#line 3639 "fe/idl.ypp" - { + case 333: +#line 3689 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); @@ -6204,12 +6680,12 @@ yyreduce: (yyval.dcval) = d; } -#line 6208 "fe/idl.tab.cpp" +#line 6684 "fe/idl.tab.cpp" break; - case 332: -#line 3664 "fe/idl.ypp" - { + case 334: +#line 3714 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); @@ -6228,20 +6704,20 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 6232 "fe/idl.tab.cpp" +#line 6708 "fe/idl.tab.cpp" break; - case 333: -#line 3687 "fe/idl.ypp" - { + case 335: +#line 3737 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_EnumSeen); } -#line 6240 "fe/idl.tab.cpp" +#line 6716 "fe/idl.tab.cpp" break; - case 334: -#line 3691 "fe/idl.ypp" - { + case 336: +#line 3741 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); AST_Enum *e = 0; @@ -6271,28 +6747,28 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 6275 "fe/idl.tab.cpp" +#line 6751 "fe/idl.tab.cpp" break; - case 335: -#line 3722 "fe/idl.ypp" - { + case 337: +#line 3772 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_EnumSqSeen); } -#line 6283 "fe/idl.tab.cpp" +#line 6759 "fe/idl.tab.cpp" break; - case 336: -#line 3726 "fe/idl.ypp" - { + case 338: +#line 3776 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_EnumBodySeen); } -#line 6291 "fe/idl.tab.cpp" +#line 6767 "fe/idl.tab.cpp" break; - case 337: -#line 3730 "fe/idl.ypp" - { + case 339: +#line 3780 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_EnumQsSeen); /* @@ -6310,20 +6786,20 @@ yyreduce: idl_global->scopes ().pop (); } } -#line 6314 "fe/idl.tab.cpp" +#line 6790 "fe/idl.tab.cpp" break; - case 339: -#line 3755 "fe/idl.ypp" - { + case 341: +#line 3805 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_EnumCommaSeen); } -#line 6322 "fe/idl.tab.cpp" +#line 6798 "fe/idl.tab.cpp" break; - case 342: -#line 3764 "fe/idl.ypp" - { + case 344: +#line 3814 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val); Identifier id ((yyvsp[0].strval)); @@ -6357,28 +6833,28 @@ yyreduce: delete annotations; } -#line 6361 "fe/idl.tab.cpp" +#line 6837 "fe/idl.tab.cpp" break; - case 343: -#line 3803 "fe/idl.ypp" - { + case 345: +#line 3853 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceCommaSeen); } -#line 6369 "fe/idl.tab.cpp" +#line 6845 "fe/idl.tab.cpp" break; - case 344: -#line 3807 "fe/idl.ypp" - { + case 346: +#line 3857 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceExprSeen); } -#line 6377 "fe/idl.tab.cpp" +#line 6853 "fe/idl.tab.cpp" break; - case 345: -#line 3811 "fe/idl.ypp" - { + case 347: +#line 3861 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceQsSeen); AST_Sequence *seq = 0; @@ -6395,7 +6871,7 @@ yyreduce: /* * Remove sequence marker from scopes stack. */ - if (idl_global->scopes ().top() == 0) + if (idl_global->scopes ().top () == 0) { idl_global->scopes ().pop (); } @@ -6449,11 +6925,7 @@ yyreduce: ); seq->base_type_annotations (*type_annotations); - if (!idl_global->in_typedef () - && !idl_global->anon_silent ()) - { - idl_global->err ()->anonymous_type_diagnostic (); - } + idl_global->err ()->anonymous_type_diagnostic (); } } @@ -6462,12 +6934,12 @@ yyreduce: ev = 0; (yyval.dcval) = seq; } -#line 6466 "fe/idl.tab.cpp" +#line 6938 "fe/idl.tab.cpp" break; - case 346: -#line 3897 "fe/idl.ypp" - { + case 348: +#line 3943 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceQsSeen); AST_Sequence *seq = 0; @@ -6521,23 +6993,19 @@ yyreduce: ); seq->base_type_annotations (*type_annotations); - if (!idl_global->in_typedef () - && !idl_global->anon_silent ()) - { - idl_global->err ()->anonymous_type_diagnostic (); - } + idl_global->err ()->anonymous_type_diagnostic (); } } delete type_annotations; (yyval.dcval) = seq; } -#line 6536 "fe/idl.tab.cpp" +#line 7004 "fe/idl.tab.cpp" break; - case 347: -#line 3966 "fe/idl.ypp" - { + case 349: +#line 4008 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceSeen); /* @@ -6545,57 +7013,57 @@ yyreduce: */ idl_global->scopes ().push (0); } -#line 6549 "fe/idl.tab.cpp" +#line 7017 "fe/idl.tab.cpp" break; - case 348: -#line 3975 "fe/idl.ypp" - { + case 350: +#line 4017 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceSqSeen); } -#line 6557 "fe/idl.tab.cpp" +#line 7025 "fe/idl.tab.cpp" break; - case 349: -#line 3979 "fe/idl.ypp" - { + case 351: +#line 4021 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceTypeSeen); Decl_Annotations_Pair *seq_head = new Decl_Annotations_Pair; seq_head->decl = (yyvsp[0].dcval); seq_head->annotations = (yyvsp[-1].annotations_val); (yyval.decl_annotations_pair_val) = seq_head; } -#line 6569 "fe/idl.tab.cpp" +#line 7037 "fe/idl.tab.cpp" break; - case 350: -#line 3990 "fe/idl.ypp" - { + case 352: +#line 4032 "fe/idl.ypp" + { (yyvsp[-1].exval)->evaluate (AST_Expression::EK_positive_int); (yyval.dcval) = idl_global->gen ()->create_fixed ((yyvsp[-3].exval), (yyvsp[-1].exval)); } -#line 6578 "fe/idl.tab.cpp" +#line 7046 "fe/idl.tab.cpp" break; - case 351: -#line 3999 "fe/idl.ypp" - { + case 353: +#line 4041 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_StringSqSeen); } -#line 6586 "fe/idl.tab.cpp" +#line 7054 "fe/idl.tab.cpp" break; - case 352: -#line 4003 "fe/idl.ypp" - { + case 354: +#line 4045 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_StringExprSeen); } -#line 6594 "fe/idl.tab.cpp" +#line 7062 "fe/idl.tab.cpp" break; - case 353: -#line 4007 "fe/idl.ypp" - { + case 355: +#line 4049 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_StringQsSeen); /* @@ -6625,10 +7093,7 @@ yyreduce: AST_String::narrow_from_decl ( tao_string_decl)); - if (!idl_global->in_typedef () && !idl_global->anon_silent ()) - { - idl_global->err ()->anonymous_type_diagnostic (); - } + idl_global->err ()->anonymous_type_diagnostic (); (yyval.dcval) = tao_string_decl; } @@ -6636,12 +7101,12 @@ yyreduce: delete ev; ev = 0; } -#line 6640 "fe/idl.tab.cpp" +#line 7105 "fe/idl.tab.cpp" break; - case 354: -#line 4049 "fe/idl.ypp" - { + case 356: +#line 4088 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_StringCompleted); /* @@ -6663,36 +7128,36 @@ yyreduce: (yyval.dcval) = tao_string_decl; } -#line 6667 "fe/idl.tab.cpp" +#line 7132 "fe/idl.tab.cpp" break; - case 355: -#line 4075 "fe/idl.ypp" - { + case 357: +#line 4114 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_StringSeen); } -#line 6675 "fe/idl.tab.cpp" +#line 7140 "fe/idl.tab.cpp" break; - case 356: -#line 4083 "fe/idl.ypp" - { + case 358: +#line 4122 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_StringSqSeen); } -#line 6683 "fe/idl.tab.cpp" +#line 7148 "fe/idl.tab.cpp" break; - case 357: -#line 4087 "fe/idl.ypp" - { + case 359: +#line 4126 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_StringExprSeen); } -#line 6691 "fe/idl.tab.cpp" +#line 7156 "fe/idl.tab.cpp" break; - case 358: -#line 4091 "fe/idl.ypp" - { + case 360: +#line 4130 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_StringQsSeen); /* @@ -6716,20 +7181,17 @@ yyreduce: AST_String::narrow_from_decl ( string)); - if (!idl_global->in_typedef () && !idl_global->anon_silent ()) - { - idl_global->err ()->anonymous_type_diagnostic (); - } + idl_global->err ()->anonymous_type_diagnostic (); (yyval.dcval) = string; } } -#line 6728 "fe/idl.tab.cpp" +#line 7190 "fe/idl.tab.cpp" break; - case 359: -#line 4124 "fe/idl.ypp" - { + case 361: +#line 4160 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_StringCompleted); /* @@ -6751,28 +7213,28 @@ yyreduce: (yyval.dcval) = string; } -#line 6755 "fe/idl.tab.cpp" +#line 7217 "fe/idl.tab.cpp" break; - case 360: -#line 4150 "fe/idl.ypp" - { + case 362: +#line 4186 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_StringSeen); } -#line 6763 "fe/idl.tab.cpp" +#line 7225 "fe/idl.tab.cpp" break; - case 361: -#line 4157 "fe/idl.ypp" - { + case 363: +#line 4193 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ArrayIDSeen); } -#line 6771 "fe/idl.tab.cpp" +#line 7233 "fe/idl.tab.cpp" break; - case 362: -#line 4161 "fe/idl.ypp" - { + case 364: +#line 4197 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ArrayCompleted); AST_Array *array = 0; @@ -6797,11 +7259,7 @@ yyreduce: array->base_type_annotations (*base_type_annotations); sn.destroy (); - if (!idl_global->in_typedef () - && !idl_global->anon_silent ()) - { - idl_global->err ()->anonymous_type_diagnostic (); - } + idl_global->err ()->anonymous_type_diagnostic (); } array_dims->destroy (); @@ -6811,23 +7269,23 @@ yyreduce: (yyval.dcval) = array; } -#line 6815 "fe/idl.tab.cpp" +#line 7273 "fe/idl.tab.cpp" break; - case 363: -#line 4204 "fe/idl.ypp" - { + case 365: +#line 4236 "fe/idl.ypp" + { ACE_NEW_RETURN ((yyval.elval), UTL_ExprList ((yyvsp[-1].exval), (yyvsp[0].elval)), 1); } -#line 6826 "fe/idl.tab.cpp" +#line 7284 "fe/idl.tab.cpp" break; - case 364: -#line 4214 "fe/idl.ypp" - { + case 366: +#line 4246 "fe/idl.ypp" + { UTL_ExprList *el = 0; ACE_NEW_RETURN (el, UTL_ExprList ((yyvsp[0].exval), @@ -6844,36 +7302,36 @@ yyreduce: (yyval.elval) = (yyvsp[-1].elval); } } -#line 6848 "fe/idl.tab.cpp" +#line 7306 "fe/idl.tab.cpp" break; - case 365: -#line 4232 "fe/idl.ypp" - { + case 367: +#line 4264 "fe/idl.ypp" + { (yyval.elval) = 0; } -#line 6856 "fe/idl.tab.cpp" +#line 7314 "fe/idl.tab.cpp" break; - case 366: -#line 4239 "fe/idl.ypp" - { + case 368: +#line 4271 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_DimSqSeen); } -#line 6864 "fe/idl.tab.cpp" +#line 7322 "fe/idl.tab.cpp" break; - case 367: -#line 4243 "fe/idl.ypp" - { + case 369: +#line 4275 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_DimExprSeen); } -#line 6872 "fe/idl.tab.cpp" +#line 7330 "fe/idl.tab.cpp" break; - case 368: -#line 4247 "fe/idl.ypp" - { + case 370: +#line 4279 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_DimQsSeen); /* @@ -6926,44 +7384,44 @@ yyreduce: delete ev; ev = 0; } -#line 6930 "fe/idl.tab.cpp" +#line 7388 "fe/idl.tab.cpp" break; - case 371: -#line 4309 "fe/idl.ypp" - { + case 373: +#line 4341 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_AttrROSeen); } -#line 6938 "fe/idl.tab.cpp" +#line 7396 "fe/idl.tab.cpp" break; - case 372: -#line 4313 "fe/idl.ypp" - { + case 374: +#line 4345 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_AttrSeen); } -#line 6946 "fe/idl.tab.cpp" +#line 7404 "fe/idl.tab.cpp" break; - case 373: -#line 4317 "fe/idl.ypp" - { + case 375: +#line 4349 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_AttrTypeSeen); } -#line 6954 "fe/idl.tab.cpp" +#line 7412 "fe/idl.tab.cpp" break; - case 374: -#line 4321 "fe/idl.ypp" - { + case 376: +#line 4353 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclsSeen); } -#line 6962 "fe/idl.tab.cpp" +#line 7420 "fe/idl.tab.cpp" break; - case 375: -#line 4325 "fe/idl.ypp" - { + case 377: +#line 4357 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Attribute *a = 0; FE_Declarator *d = 0; @@ -7014,44 +7472,44 @@ yyreduce: (yyval.dcval) = a; } -#line 7018 "fe/idl.tab.cpp" +#line 7476 "fe/idl.tab.cpp" break; - case 376: -#line 4380 "fe/idl.ypp" - { + case 378: +#line 4412 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_AttrSeen); } -#line 7026 "fe/idl.tab.cpp" +#line 7484 "fe/idl.tab.cpp" break; - case 377: -#line 4384 "fe/idl.ypp" - { + case 379: +#line 4416 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_AttrTypeSeen); } -#line 7034 "fe/idl.tab.cpp" +#line 7492 "fe/idl.tab.cpp" break; - case 378: -#line 4388 "fe/idl.ypp" - { + case 380: +#line 4420 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclsSeen); } -#line 7042 "fe/idl.tab.cpp" +#line 7500 "fe/idl.tab.cpp" break; - case 379: -#line 4392 "fe/idl.ypp" - { + case 381: +#line 4424 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseCompleted); } -#line 7050 "fe/idl.tab.cpp" +#line 7508 "fe/idl.tab.cpp" break; - case 380: -#line 4396 "fe/idl.ypp" - { + case 382: +#line 4428 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Attribute *a = 0; FE_Declarator *d = 0; @@ -7111,91 +7569,94 @@ yyreduce: (yyval.dcval) = a; } -#line 7115 "fe/idl.tab.cpp" +#line 7573 "fe/idl.tab.cpp" break; - case 381: -#line 4460 "fe/idl.ypp" - { + case 383: +#line 4492 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptSeen); } -#line 7123 "fe/idl.tab.cpp" +#line 7581 "fe/idl.tab.cpp" break; - case 382: -#line 4464 "fe/idl.ypp" - { - UTL_Scope *s = idl_global->scopes ().top_non_null (); - UTL_ScopedName n ((yyvsp[0].idval), - 0); - AST_Exception *e = 0; + case 384: +#line 4496 "fe/idl.ypp" + { + Identifier *&id = (yyvsp[0].idval); + UTL_Scope *scope = idl_global->scopes ().top_non_null (); + UTL_ScopedName scoped_name (id, 0); + AST_Exception *exception = 0; idl_global->set_parse_state (IDL_GlobalData::PS_ExceptIDSeen); /* * Create a node representing an exception and add it to * the enclosing scope. */ - if (s != 0) + if (scope) { - e = idl_global->gen ()->create_exception (&n, - s->is_local (), - s->is_abstract ()); - (void) s->fe_add_exception (e); + exception = idl_global->gen ()->create_exception ( + &scoped_name, + scope->is_local (), + scope->is_abstract ()); + scope->fe_add_exception (exception); } /* * Push the exception scope on the scope stack. */ - idl_global->scopes ().push (e); + idl_global->scopes ().push (exception); - (yyvsp[0].idval)->destroy (); - delete (yyvsp[0].idval); - (yyvsp[0].idval) = 0; + id->destroy (); + delete id; + id = 0; + + (yyval.dcval) = exception; } -#line 7156 "fe/idl.tab.cpp" +#line 7617 "fe/idl.tab.cpp" break; - case 383: -#line 4493 "fe/idl.ypp" - { + case 385: +#line 4528 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptSqSeen); } -#line 7164 "fe/idl.tab.cpp" +#line 7625 "fe/idl.tab.cpp" break; - case 384: -#line 4497 "fe/idl.ypp" - { + case 386: +#line 4532 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptBodySeen); } -#line 7172 "fe/idl.tab.cpp" +#line 7633 "fe/idl.tab.cpp" break; - case 385: -#line 4501 "fe/idl.ypp" - { + case 387: +#line 4536 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptQsSeen); /* * Done with this exception. Pop its scope from the scope stack. */ idl_global->scopes ().pop (); - (yyval.dcval) = 0; + (yyval.dcval) = (yyvsp[-5].dcval); } -#line 7186 "fe/idl.tab.cpp" +#line 7647 "fe/idl.tab.cpp" break; - case 386: -#line 4514 "fe/idl.ypp" - { + case 388: +#line 4549 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpTypeSeen); } -#line 7194 "fe/idl.tab.cpp" +#line 7655 "fe/idl.tab.cpp" break; - case 387: -#line 4518 "fe/idl.ypp" - { + case 389: +#line 4553 "fe/idl.ypp" + { AST_Operation *op = 0; UTL_Scope *scope = idl_global->scopes ().top_non_null (); @@ -7255,28 +7716,28 @@ yyreduce: */ idl_global->scopes ().push (op); } -#line 7259 "fe/idl.tab.cpp" +#line 7720 "fe/idl.tab.cpp" break; - case 388: -#line 4579 "fe/idl.ypp" - { + case 390: +#line 4614 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 7267 "fe/idl.tab.cpp" +#line 7728 "fe/idl.tab.cpp" break; - case 389: -#line 4583 "fe/idl.ypp" - { + case 391: +#line 4618 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); } -#line 7275 "fe/idl.tab.cpp" +#line 7736 "fe/idl.tab.cpp" break; - case 390: -#line 4587 "fe/idl.ypp" - { + case 392: +#line 4622 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Operation *o = 0; idl_global->set_parse_state (IDL_GlobalData::PS_OpCompleted); @@ -7306,58 +7767,58 @@ yyreduce: (yyval.dcval) = o; } -#line 7310 "fe/idl.tab.cpp" +#line 7771 "fe/idl.tab.cpp" break; - case 391: -#line 4621 "fe/idl.ypp" - { + case 393: +#line 4656 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpAttrSeen); (yyval.ofval) = AST_Operation::OP_oneway; } -#line 7319 "fe/idl.tab.cpp" +#line 7780 "fe/idl.tab.cpp" break; - case 392: -#line 4626 "fe/idl.ypp" - { + case 394: +#line 4661 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpAttrSeen); (yyval.ofval) = AST_Operation::OP_idempotent; } -#line 7328 "fe/idl.tab.cpp" +#line 7789 "fe/idl.tab.cpp" break; - case 393: -#line 4631 "fe/idl.ypp" - { + case 395: +#line 4666 "fe/idl.ypp" + { (yyval.ofval) = AST_Operation::OP_noflags; } -#line 7336 "fe/idl.tab.cpp" +#line 7797 "fe/idl.tab.cpp" break; - case 395: -#line 4639 "fe/idl.ypp" - { + case 397: +#line 4674 "fe/idl.ypp" + { (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ( AST_Expression::EV_void ); } -#line 7347 "fe/idl.tab.cpp" +#line 7808 "fe/idl.tab.cpp" break; - case 396: -#line 4649 "fe/idl.ypp" - { + case 398: +#line 4684 "fe/idl.ypp" + { //@@ PS_FactorySeen? idl_global->set_parse_state (IDL_GlobalData::PS_OpTypeSeen); } -#line 7356 "fe/idl.tab.cpp" +#line 7817 "fe/idl.tab.cpp" break; - case 397: -#line 4654 "fe/idl.ypp" - { + case 399: +#line 4689 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); if (s->is_abstract ()) @@ -7397,25 +7858,25 @@ yyreduce: */ idl_global->scopes ().push (factory); - delete (yyvsp[-1].annotations_val); + (yyval.dcval) = factory; } -#line 7403 "fe/idl.tab.cpp" +#line 7864 "fe/idl.tab.cpp" break; - case 398: -#line 4697 "fe/idl.ypp" - { + case 400: +#line 4732 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 7411 "fe/idl.tab.cpp" +#line 7872 "fe/idl.tab.cpp" break; - case 399: -#line 4701 "fe/idl.ypp" - { + case 401: +#line 4736 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); - if ((yyvsp[0].nlval) != 0) + if ((yyvsp[0].nlval)) { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Factory *f = AST_Factory::narrow_from_scope (s); @@ -7423,69 +7884,71 @@ yyreduce: } idl_global->scopes ().pop (); + + (yyval.dcval) = (yyvsp[-3].dcval); } -#line 7428 "fe/idl.tab.cpp" +#line 7891 "fe/idl.tab.cpp" break; - case 400: -#line 4717 "fe/idl.ypp" - { + case 402: +#line 4754 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 7436 "fe/idl.tab.cpp" +#line 7899 "fe/idl.tab.cpp" break; - case 401: -#line 4721 "fe/idl.ypp" - { + case 403: +#line 4758 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 7444 "fe/idl.tab.cpp" +#line 7907 "fe/idl.tab.cpp" break; - case 402: -#line 4725 "fe/idl.ypp" - { + case 404: +#line 4762 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 7452 "fe/idl.tab.cpp" +#line 7915 "fe/idl.tab.cpp" break; - case 403: -#line 4730 "fe/idl.ypp" - { + case 405: +#line 4767 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 7460 "fe/idl.tab.cpp" +#line 7923 "fe/idl.tab.cpp" break; - case 405: -#line 4740 "fe/idl.ypp" - { + case 407: +#line 4777 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpParCommaSeen); } -#line 7468 "fe/idl.tab.cpp" +#line 7931 "fe/idl.tab.cpp" break; - case 408: -#line 4749 "fe/idl.ypp" - { + case 410: +#line 4786 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpParDirSeen); } -#line 7476 "fe/idl.tab.cpp" +#line 7939 "fe/idl.tab.cpp" break; - case 409: -#line 4753 "fe/idl.ypp" - { + case 411: +#line 4790 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpParTypeSeen); } -#line 7484 "fe/idl.tab.cpp" +#line 7947 "fe/idl.tab.cpp" break; - case 410: -#line 4757 "fe/idl.ypp" - { + case 412: +#line 4794 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Argument *a = 0; idl_global->set_parse_state (IDL_GlobalData::PS_OpParDeclSeen); @@ -7516,68 +7979,68 @@ yyreduce: delete (yyvsp[0].deval); (yyvsp[0].deval) = 0; } -#line 7520 "fe/idl.tab.cpp" +#line 7983 "fe/idl.tab.cpp" break; - case 411: -#line 4792 "fe/idl.ypp" - { + case 413: +#line 4829 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 7528 "fe/idl.tab.cpp" +#line 7991 "fe/idl.tab.cpp" break; - case 412: -#line 4796 "fe/idl.ypp" - { + case 414: +#line 4833 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 7536 "fe/idl.tab.cpp" +#line 7999 "fe/idl.tab.cpp" break; - case 413: -#line 4800 "fe/idl.ypp" - { + case 415: +#line 4837 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 7544 "fe/idl.tab.cpp" +#line 8007 "fe/idl.tab.cpp" break; - case 414: -#line 4805 "fe/idl.ypp" - { + case 416: +#line 4842 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 7552 "fe/idl.tab.cpp" +#line 8015 "fe/idl.tab.cpp" break; - case 416: -#line 4815 "fe/idl.ypp" - { + case 418: +#line 4852 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpParCommaSeen); } -#line 7560 "fe/idl.tab.cpp" +#line 8023 "fe/idl.tab.cpp" break; - case 419: -#line 4824 "fe/idl.ypp" - { + case 421: +#line 4861 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpParDirSeen); } -#line 7568 "fe/idl.tab.cpp" +#line 8031 "fe/idl.tab.cpp" break; - case 420: -#line 4828 "fe/idl.ypp" - { + case 422: +#line 4865 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpParTypeSeen); } -#line 7576 "fe/idl.tab.cpp" +#line 8039 "fe/idl.tab.cpp" break; - case 421: -#line 4832 "fe/idl.ypp" - { + case 423: +#line 4869 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Argument *a = 0; idl_global->set_parse_state (IDL_GlobalData::PS_OpParDeclSeen); @@ -7615,23 +8078,23 @@ yyreduce: delete (yyvsp[0].deval); (yyvsp[0].deval) = 0; } -#line 7619 "fe/idl.tab.cpp" +#line 8082 "fe/idl.tab.cpp" break; - case 422: -#line 4874 "fe/idl.ypp" - { + case 424: +#line 4911 "fe/idl.ypp" + { (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ( (yyvsp[0].etval) ); } -#line 7630 "fe/idl.tab.cpp" +#line 8093 "fe/idl.tab.cpp" break; - case 425: -#line 4883 "fe/idl.ypp" - { + case 427: +#line 4920 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = 0; UTL_ScopedName *n = (yyvsp[0].idlist); @@ -7734,187 +8197,187 @@ yyreduce: (yyval.dcval) = d; } -#line 7738 "fe/idl.tab.cpp" +#line 8201 "fe/idl.tab.cpp" break; - case 426: -#line 4990 "fe/idl.ypp" - { + case 428: +#line 5027 "fe/idl.ypp" + { (yyval.dival) = AST_Argument::dir_IN; } -#line 7746 "fe/idl.tab.cpp" +#line 8209 "fe/idl.tab.cpp" break; - case 427: -#line 4994 "fe/idl.ypp" - { + case 429: +#line 5031 "fe/idl.ypp" + { (yyval.dival) = AST_Argument::dir_OUT; } -#line 7754 "fe/idl.tab.cpp" +#line 8217 "fe/idl.tab.cpp" break; - case 428: -#line 4998 "fe/idl.ypp" - { + case 430: +#line 5035 "fe/idl.ypp" + { (yyval.dival) = AST_Argument::dir_INOUT; } -#line 7762 "fe/idl.tab.cpp" +#line 8225 "fe/idl.tab.cpp" break; - case 429: -#line 5005 "fe/idl.ypp" - { + case 431: +#line 5042 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseSeen); } -#line 7770 "fe/idl.tab.cpp" +#line 8233 "fe/idl.tab.cpp" break; - case 430: -#line 5009 "fe/idl.ypp" - { + case 432: +#line 5046 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseSqSeen); } -#line 7778 "fe/idl.tab.cpp" +#line 8241 "fe/idl.tab.cpp" break; - case 431: -#line 5014 "fe/idl.ypp" - { + case 433: +#line 5051 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseQsSeen); (yyval.nlval) = (yyvsp[-1].nlval); } -#line 7787 "fe/idl.tab.cpp" +#line 8250 "fe/idl.tab.cpp" break; - case 432: -#line 5019 "fe/idl.ypp" - { + case 434: +#line 5056 "fe/idl.ypp" + { (yyval.nlval) = 0; } -#line 7795 "fe/idl.tab.cpp" +#line 8258 "fe/idl.tab.cpp" break; - case 433: -#line 5026 "fe/idl.ypp" - { + case 435: +#line 5063 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseSeen); } -#line 7803 "fe/idl.tab.cpp" +#line 8266 "fe/idl.tab.cpp" break; - case 434: -#line 5030 "fe/idl.ypp" - { + case 436: +#line 5067 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseSqSeen); } -#line 7811 "fe/idl.tab.cpp" +#line 8274 "fe/idl.tab.cpp" break; - case 435: -#line 5035 "fe/idl.ypp" - { + case 437: +#line 5072 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseQsSeen); (yyval.nlval) = (yyvsp[-1].nlval); } -#line 7820 "fe/idl.tab.cpp" +#line 8283 "fe/idl.tab.cpp" break; - case 436: -#line 5040 "fe/idl.ypp" - { + case 438: +#line 5077 "fe/idl.ypp" + { (yyval.nlval) = 0; } -#line 7828 "fe/idl.tab.cpp" +#line 8291 "fe/idl.tab.cpp" break; - case 437: -#line 5047 "fe/idl.ypp" - { + case 439: +#line 5084 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseSeen); } -#line 7836 "fe/idl.tab.cpp" +#line 8299 "fe/idl.tab.cpp" break; - case 438: -#line 5051 "fe/idl.ypp" - { + case 440: +#line 5088 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseSqSeen); } -#line 7844 "fe/idl.tab.cpp" +#line 8307 "fe/idl.tab.cpp" break; - case 439: -#line 5056 "fe/idl.ypp" - { + case 441: +#line 5093 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseQsSeen); (yyval.nlval) = (yyvsp[-1].nlval); } -#line 7853 "fe/idl.tab.cpp" +#line 8316 "fe/idl.tab.cpp" break; - case 440: -#line 5061 "fe/idl.ypp" - { + case 442: +#line 5098 "fe/idl.ypp" + { (yyval.nlval) = 0; } -#line 7861 "fe/idl.tab.cpp" +#line 8324 "fe/idl.tab.cpp" break; - case 441: -#line 5068 "fe/idl.ypp" - { + case 443: +#line 5105 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpContextSeen); } -#line 7869 "fe/idl.tab.cpp" +#line 8332 "fe/idl.tab.cpp" break; - case 442: -#line 5072 "fe/idl.ypp" - { + case 444: +#line 5109 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpContextSqSeen); } -#line 7877 "fe/idl.tab.cpp" +#line 8340 "fe/idl.tab.cpp" break; - case 443: -#line 5077 "fe/idl.ypp" - { + case 445: +#line 5114 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpContextQsSeen); (yyval.slval) = (yyvsp[-1].slval); } -#line 7886 "fe/idl.tab.cpp" +#line 8349 "fe/idl.tab.cpp" break; - case 444: -#line 5082 "fe/idl.ypp" - { + case 446: +#line 5119 "fe/idl.ypp" + { (yyval.slval) = 0; } -#line 7894 "fe/idl.tab.cpp" +#line 8357 "fe/idl.tab.cpp" break; - case 445: -#line 5089 "fe/idl.ypp" - { + case 447: +#line 5126 "fe/idl.ypp" + { ACE_NEW_RETURN ((yyval.slval), UTL_StrList ((yyvsp[-1].sval), (yyvsp[0].slval)), 1); } -#line 7905 "fe/idl.tab.cpp" +#line 8368 "fe/idl.tab.cpp" break; - case 446: -#line 5100 "fe/idl.ypp" - { + case 448: +#line 5137 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpContextCommaSeen); } -#line 7913 "fe/idl.tab.cpp" +#line 8376 "fe/idl.tab.cpp" break; - case 447: -#line 5104 "fe/idl.ypp" - { + case 449: +#line 5141 "fe/idl.ypp" + { UTL_StrList *sl = 0; ACE_NEW_RETURN (sl, UTL_StrList ((yyvsp[0].sval), @@ -7931,20 +8394,20 @@ yyreduce: (yyval.slval) = (yyvsp[-3].slval); } } -#line 7935 "fe/idl.tab.cpp" +#line 8398 "fe/idl.tab.cpp" break; - case 448: -#line 5122 "fe/idl.ypp" - { + case 450: +#line 5159 "fe/idl.ypp" + { (yyval.slval) = 0; } -#line 7943 "fe/idl.tab.cpp" +#line 8406 "fe/idl.tab.cpp" break; - case 449: -#line 5129 "fe/idl.ypp" - { + case 451: +#line 5166 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = s->lookup_by_name ((yyvsp[-1].idlist)); @@ -7970,12 +8433,12 @@ yyreduce: (yyval.dcval) = 0; } -#line 7974 "fe/idl.tab.cpp" +#line 8437 "fe/idl.tab.cpp" break; - case 450: -#line 5159 "fe/idl.ypp" - { + case 452: +#line 5196 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = ScopeAsDecl (s); @@ -8010,12 +8473,12 @@ yyreduce: (yyval.dcval) = 0; } -#line 8014 "fe/idl.tab.cpp" +#line 8477 "fe/idl.tab.cpp" break; - case 453: -#line 5204 "fe/idl.ypp" - { + case 455: +#line 5241 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); @@ -8040,71 +8503,74 @@ yyreduce: (yyval.dcval) = 0; } -#line 8044 "fe/idl.tab.cpp" +#line 8507 "fe/idl.tab.cpp" break; - case 454: -#line 5233 "fe/idl.ypp" - { - UTL_Scope *s = idl_global->scopes ().top_non_null (); - AST_Component *c = 0; + case 456: +#line 5270 "fe/idl.ypp" + { + FE_ComponentHeader *&component_header = (yyvsp[0].chval); + UTL_Scope *scope = idl_global->scopes ().top_non_null (); + AST_Component *component = 0; /* * Make a new component node and add it to the enclosing scope. */ - if (s != 0 && (yyvsp[0].chval) != 0) - { - c = - idl_global->gen ()->create_component ( - (yyvsp[0].chval)->name (), - (yyvsp[0].chval)->base_component (), - (yyvsp[0].chval)->supports (), - (yyvsp[0].chval)->n_supports (), - (yyvsp[0].chval)->supports_flat (), - (yyvsp[0].chval)->n_supports_flat () - ); - AST_Interface *i = AST_Interface::narrow_from_decl (c); - AST_Interface::fwd_redefinition_helper (i, - s); + if (scope && component_header) + { + component = idl_global->gen ()->create_component ( + component_header->name (), + component_header->base_component (), + component_header->supports (), + component_header->n_supports (), + component_header->supports_flat (), + component_header->n_supports_flat ()); + AST_Interface *component_as_interface = + dynamic_cast<AST_Interface *> (component); + AST_Interface::fwd_redefinition_helper ( + component_as_interface, scope); + component = dynamic_cast<AST_Component *> (component_as_interface); + /* * Add the component to its definition scope. */ - c = AST_Component::narrow_from_decl (i); - (void) s->fe_add_component (c); + scope->fe_add_component (component); // This FE_ComponentHeader class isn't destroyed with the AST. - (yyvsp[0].chval)->destroy (); - delete (yyvsp[0].chval); - (yyvsp[0].chval) = 0; + component_header->destroy (); + delete component_header; + component_header = 0; } /* * Push it on the scope stack. */ - idl_global->scopes ().push (c); + idl_global->scopes ().push (component); + + (yyval.dcval) = component; } -#line 8087 "fe/idl.tab.cpp" +#line 8553 "fe/idl.tab.cpp" break; - case 455: -#line 5272 "fe/idl.ypp" - { + case 457: +#line 5312 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentSqSeen); } -#line 8095 "fe/idl.tab.cpp" +#line 8561 "fe/idl.tab.cpp" break; - case 456: -#line 5276 "fe/idl.ypp" - { + case 458: +#line 5316 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentBodySeen); } -#line 8103 "fe/idl.tab.cpp" +#line 8569 "fe/idl.tab.cpp" break; - case 457: -#line 5280 "fe/idl.ypp" - { + case 459: +#line 5320 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentQsSeen); /* @@ -8112,30 +8578,30 @@ yyreduce: */ idl_global->scopes ().pop (); - (yyval.dcval) = 0; + (yyval.dcval) = (yyvsp[-5].dcval); } -#line 8118 "fe/idl.tab.cpp" +#line 8584 "fe/idl.tab.cpp" break; - case 458: -#line 5295 "fe/idl.ypp" - { + case 460: +#line 5335 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentIDSeen); } -#line 8126 "fe/idl.tab.cpp" +#line 8592 "fe/idl.tab.cpp" break; - case 459: -#line 5299 "fe/idl.ypp" - { + case 461: +#line 5339 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 8134 "fe/idl.tab.cpp" +#line 8600 "fe/idl.tab.cpp" break; - case 460: -#line 5303 "fe/idl.ypp" - { + case 462: +#line 5343 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); /* @@ -8168,148 +8634,174 @@ yyreduce: (yyvsp[-2].idlist) = 0; } } -#line 8172 "fe/idl.tab.cpp" +#line 8638 "fe/idl.tab.cpp" break; - case 461: -#line 5340 "fe/idl.ypp" - { + case 463: +#line 5380 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen); } -#line 8180 "fe/idl.tab.cpp" +#line 8646 "fe/idl.tab.cpp" break; - case 462: -#line 5344 "fe/idl.ypp" - { + case 464: +#line 5384 "fe/idl.ypp" + { (yyval.idlist) = (yyvsp[0].idlist); } -#line 8188 "fe/idl.tab.cpp" +#line 8654 "fe/idl.tab.cpp" break; - case 463: -#line 5348 "fe/idl.ypp" - { + case 465: +#line 5388 "fe/idl.ypp" + { (yyval.idlist) = 0; } -#line 8196 "fe/idl.tab.cpp" +#line 8662 "fe/idl.tab.cpp" break; case 466: -#line 5360 "fe/idl.ypp" - { +#line 5395 "fe/idl.ypp" + { + AST_Annotation_Appls *&annotations = (yyvsp[-1].annotations_val); + AST_Decl *&node = (yyvsp[0].dcval); + if (node) + { + node->annotation_appls (*annotations); + } + else + { + idl_global->err ()-> unsupported_warning ( + "Annotating this is not supported"); + } + delete annotations; + } +#line 8681 "fe/idl.tab.cpp" + break; + + case 469: +#line 5415 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ProvidesDeclSeen); } -#line 8204 "fe/idl.tab.cpp" +#line 8689 "fe/idl.tab.cpp" break; - case 467: -#line 5364 "fe/idl.ypp" - { + case 470: +#line 5419 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); + (yyval.dcval) = (yyvsp[-2].dcval); } -#line 8212 "fe/idl.tab.cpp" +#line 8698 "fe/idl.tab.cpp" break; - case 468: -#line 5368 "fe/idl.ypp" - { + case 471: +#line 5424 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_UsesDeclSeen); } -#line 8220 "fe/idl.tab.cpp" +#line 8706 "fe/idl.tab.cpp" break; - case 469: -#line 5372 "fe/idl.ypp" - { + case 472: +#line 5428 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); + (yyval.dcval) = (yyvsp[-2].dcval); } -#line 8228 "fe/idl.tab.cpp" +#line 8715 "fe/idl.tab.cpp" break; - case 470: -#line 5376 "fe/idl.ypp" - { + case 473: +#line 5433 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_EmitsDeclSeen); } -#line 8236 "fe/idl.tab.cpp" +#line 8723 "fe/idl.tab.cpp" break; - case 471: -#line 5380 "fe/idl.ypp" - { + case 474: +#line 5437 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); + (yyval.dcval) = (yyvsp[-2].dcval); } -#line 8244 "fe/idl.tab.cpp" +#line 8732 "fe/idl.tab.cpp" break; - case 472: -#line 5384 "fe/idl.ypp" - { + case 475: +#line 5442 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_PublishesDeclSeen); } -#line 8252 "fe/idl.tab.cpp" +#line 8740 "fe/idl.tab.cpp" break; - case 473: -#line 5388 "fe/idl.ypp" - { + case 476: +#line 5446 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); + (yyval.dcval) = (yyvsp[-2].dcval); } -#line 8260 "fe/idl.tab.cpp" +#line 8749 "fe/idl.tab.cpp" break; - case 474: -#line 5392 "fe/idl.ypp" - { + case 477: +#line 5451 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ConsumesDeclSeen); } -#line 8268 "fe/idl.tab.cpp" +#line 8757 "fe/idl.tab.cpp" break; - case 475: -#line 5396 "fe/idl.ypp" - { + case 478: +#line 5455 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); + (yyval.dcval) = (yyvsp[-2].dcval); } -#line 8276 "fe/idl.tab.cpp" +#line 8766 "fe/idl.tab.cpp" break; - case 476: -#line 5400 "fe/idl.ypp" - { + case 479: +#line 5460 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 8284 "fe/idl.tab.cpp" +#line 8774 "fe/idl.tab.cpp" break; - case 477: -#line 5404 "fe/idl.ypp" - { + case 480: +#line 5464 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); + (yyval.dcval) = (yyvsp[-2].dcval); } -#line 8292 "fe/idl.tab.cpp" +#line 8783 "fe/idl.tab.cpp" break; - case 478: -#line 5408 "fe/idl.ypp" - { + case 481: +#line 5469 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen); } -#line 8300 "fe/idl.tab.cpp" +#line 8791 "fe/idl.tab.cpp" break; - case 479: -#line 5412 "fe/idl.ypp" - { + case 482: +#line 5473 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); + (yyval.dcval) = (yyvsp[-2].dcval); } -#line 8308 "fe/idl.tab.cpp" +#line 8800 "fe/idl.tab.cpp" break; - case 480: -#line 5418 "fe/idl.ypp" - { + case 483: +#line 5480 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; AST_Decl::NodeType nt = AST_Decl::NT_type; @@ -8369,6 +8861,8 @@ yyreduce: } } + AST_Provides *provides = 0; + if (so_far_so_good) { AST_Type *port_interface_type = @@ -8380,11 +8874,10 @@ yyreduce: UTL_ScopedName sn ((yyvsp[0].idval), 0); - AST_Provides *p = - idl_global->gen ()->create_provides (&sn, - port_interface_type); + provides = idl_global->gen ()->create_provides ( + &sn, port_interface_type); - (void) s->fe_add_provides (p); + (void) s->fe_add_provides (provides); } (yyvsp[-1].idlist)->destroy (); @@ -8394,23 +8887,25 @@ yyreduce: (yyvsp[0].idval)->destroy (); delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; + + (yyval.dcval) = dynamic_cast<AST_Decl *> (provides); } -#line 8399 "fe/idl.tab.cpp" +#line 8894 "fe/idl.tab.cpp" break; - case 481: -#line 5508 "fe/idl.ypp" - { + case 484: +#line 5573 "fe/idl.ypp" + { // Lookups and checking are done where the 'interface_type' // token is used, in 'provides_decl' and 'uses_decl'. (yyval.idlist) = (yyvsp[0].idlist); } -#line 8409 "fe/idl.tab.cpp" +#line 8904 "fe/idl.tab.cpp" break; - case 482: -#line 5514 "fe/idl.ypp" - { + case 485: +#line 5579 "fe/idl.ypp" + { Identifier *corba_id = 0; ACE_NEW_RETURN (corba_id, @@ -8432,12 +8927,12 @@ yyreduce: conc_name), 1); } -#line 8436 "fe/idl.tab.cpp" +#line 8931 "fe/idl.tab.cpp" break; - case 483: -#line 5539 "fe/idl.ypp" - { + case 486: +#line 5604 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; AST_Decl::NodeType nt = AST_Decl::NT_type; @@ -8497,6 +8992,8 @@ yyreduce: } } + AST_Uses *uses = 0; + if (so_far_so_good) { AST_Type *port_interface_type = @@ -8508,18 +9005,15 @@ yyreduce: UTL_ScopedName sn ((yyvsp[0].idval), 0); - AST_Uses *u = - idl_global->gen ()->create_uses (&sn, - port_interface_type, - (yyvsp[-2].bval)); - - (void) s->fe_add_uses (u); + uses = idl_global->gen ()->create_uses ( + &sn, port_interface_type, (yyvsp[-2].bval)); + s->fe_add_uses (uses); AST_Component *c = AST_Component::narrow_from_scope (s); if (c != 0 - && u->is_multiple () + && uses->is_multiple () && !idl_global->using_ifr_backend () && !idl_global->ignore_idl3 () && nt != AST_Decl::NT_param_holder) @@ -8527,7 +9021,7 @@ yyreduce: // These datatypes must be created in the // front end so they can be looked up // when compiling the generated executor IDL. - FE_Utils::create_uses_multiple_stuff (c, u); + FE_Utils::create_uses_multiple_stuff (c, uses); } } @@ -8538,39 +9032,41 @@ yyreduce: (yyvsp[0].idval)->destroy (); delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; + + (yyval.dcval) = uses; } -#line 8543 "fe/idl.tab.cpp" +#line 9039 "fe/idl.tab.cpp" break; - case 484: -#line 5645 "fe/idl.ypp" - { + case 487: +#line 5711 "fe/idl.ypp" + { // We use this extra rule here to use in both uses_decl and // extended_uses_decl, so the LALR(1) parser can avoid conflicts. (yyval.bval) = (yyvsp[0].bval); } -#line 8553 "fe/idl.tab.cpp" +#line 9049 "fe/idl.tab.cpp" break; - case 485: -#line 5654 "fe/idl.ypp" - { + case 488: +#line 5720 "fe/idl.ypp" + { (yyval.bval) = true; } -#line 8561 "fe/idl.tab.cpp" +#line 9057 "fe/idl.tab.cpp" break; - case 486: -#line 5658 "fe/idl.ypp" - { + case 489: +#line 5724 "fe/idl.ypp" + { (yyval.bval) = false; } -#line 8569 "fe/idl.tab.cpp" +#line 9065 "fe/idl.tab.cpp" break; - case 487: -#line 5664 "fe/idl.ypp" - { + case 490: +#line 5731 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; AST_Decl::NodeType nt = AST_Decl::NT_type; @@ -8613,6 +9109,8 @@ yyreduce: } } + AST_Emits *e = 0; + if (so_far_so_good) { AST_Type *event_type = @@ -8624,9 +9122,7 @@ yyreduce: UTL_ScopedName sn ((yyvsp[0].idval), 0); - AST_Emits *e = - idl_global->gen ()->create_emits (&sn, - event_type); + e = idl_global->gen ()->create_emits (&sn, event_type); (void) s->fe_add_emits (e); } @@ -8638,13 +9134,15 @@ yyreduce: (yyvsp[0].idval)->destroy (); delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; + + (yyval.dcval) = e; } -#line 8643 "fe/idl.tab.cpp" +#line 9141 "fe/idl.tab.cpp" break; - case 488: -#line 5736 "fe/idl.ypp" - { + case 491: +#line 5806 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; AST_Decl::NodeType nt = AST_Decl::NT_type; @@ -8687,6 +9185,8 @@ yyreduce: } } + AST_Publishes *p = 0; + if (so_far_so_good) { AST_Type *event_type = @@ -8695,14 +9195,9 @@ yyreduce: // Strip off _cxx_, if any, for port name. FE_Utils::original_local_name ((yyvsp[0].idval)); - UTL_ScopedName sn ((yyvsp[0].idval), - 0); - - AST_Publishes *p = - idl_global->gen ()->create_publishes (&sn, - event_type); - - (void) s->fe_add_publishes (p); + UTL_ScopedName sn ((yyvsp[0].idval), 0); + p = idl_global->gen ()->create_publishes (&sn, event_type); + s->fe_add_publishes (p); } (yyvsp[-1].idlist)->destroy (); @@ -8712,13 +9207,15 @@ yyreduce: (yyvsp[0].idval)->destroy (); delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; + + (yyval.dcval) = p; } -#line 8717 "fe/idl.tab.cpp" +#line 9214 "fe/idl.tab.cpp" break; - case 489: -#line 5808 "fe/idl.ypp" - { + case 492: +#line 5878 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; AST_Decl::NodeType nt = AST_Decl::NT_type; @@ -8761,6 +9258,8 @@ yyreduce: } } + AST_Consumes *c = 0; + if (so_far_so_good) { AST_Type *event_type = @@ -8772,9 +9271,7 @@ yyreduce: UTL_ScopedName sn ((yyvsp[0].idval), 0); - AST_Consumes *c = - idl_global->gen ()->create_consumes (&sn, - event_type); + c = idl_global->gen ()->create_consumes (&sn, event_type); (void) s->fe_add_consumes (c); } @@ -8786,13 +9283,15 @@ yyreduce: (yyvsp[0].idval)->destroy (); delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; + + (yyval.dcval) = c; } -#line 8791 "fe/idl.tab.cpp" +#line 9290 "fe/idl.tab.cpp" break; - case 490: -#line 5881 "fe/idl.ypp" - { + case 493: +#line 5953 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Home *h = 0; @@ -8828,12 +9327,12 @@ yyreduce: */ idl_global->scopes ().push (h); } -#line 8832 "fe/idl.tab.cpp" +#line 9331 "fe/idl.tab.cpp" break; - case 491: -#line 5918 "fe/idl.ypp" - { + case 494: +#line 5990 "fe/idl.ypp" + { /* * Done with this component - pop it off the scopes stack. */ @@ -8841,60 +9340,60 @@ yyreduce: (yyval.dcval) = 0; } -#line 8845 "fe/idl.tab.cpp" +#line 9344 "fe/idl.tab.cpp" break; - case 492: -#line 5930 "fe/idl.ypp" - { + case 495: +#line 6002 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_HomeSeen); } -#line 8853 "fe/idl.tab.cpp" +#line 9352 "fe/idl.tab.cpp" break; - case 493: -#line 5934 "fe/idl.ypp" - { + case 496: +#line 6006 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_HomeIDSeen); } -#line 8861 "fe/idl.tab.cpp" +#line 9360 "fe/idl.tab.cpp" break; - case 494: -#line 5938 "fe/idl.ypp" - { + case 497: +#line 6010 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 8869 "fe/idl.tab.cpp" +#line 9368 "fe/idl.tab.cpp" break; - case 495: -#line 5942 "fe/idl.ypp" - { + case 498: +#line 6014 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); } -#line 8877 "fe/idl.tab.cpp" +#line 9376 "fe/idl.tab.cpp" break; - case 496: -#line 5946 "fe/idl.ypp" - { + case 499: +#line 6018 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ManagesSeen); } -#line 8885 "fe/idl.tab.cpp" +#line 9384 "fe/idl.tab.cpp" break; - case 497: -#line 5950 "fe/idl.ypp" - { + case 500: +#line 6022 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ManagesIDSeen); } -#line 8893 "fe/idl.tab.cpp" +#line 9392 "fe/idl.tab.cpp" break; - case 498: -#line 5954 "fe/idl.ypp" - { + case 501: +#line 6026 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_PrimaryKeySpecSeen); /* @@ -8939,108 +9438,108 @@ yyreduce: (yyvsp[-6].nlval) = 0; } } -#line 8943 "fe/idl.tab.cpp" +#line 9442 "fe/idl.tab.cpp" break; - case 499: -#line 6003 "fe/idl.ypp" - { + case 502: +#line 6075 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen); } -#line 8951 "fe/idl.tab.cpp" +#line 9450 "fe/idl.tab.cpp" break; - case 500: -#line 6007 "fe/idl.ypp" - { + case 503: +#line 6079 "fe/idl.ypp" + { (yyval.idlist) = (yyvsp[0].idlist); } -#line 8959 "fe/idl.tab.cpp" +#line 9458 "fe/idl.tab.cpp" break; - case 501: -#line 6011 "fe/idl.ypp" - { + case 504: +#line 6083 "fe/idl.ypp" + { (yyval.idlist) = 0; } -#line 8967 "fe/idl.tab.cpp" +#line 9466 "fe/idl.tab.cpp" break; - case 502: -#line 6019 "fe/idl.ypp" - { + case 505: +#line 6091 "fe/idl.ypp" + { (yyval.idlist) = (yyvsp[0].idlist); } -#line 8975 "fe/idl.tab.cpp" +#line 9474 "fe/idl.tab.cpp" break; - case 503: -#line 6023 "fe/idl.ypp" - { + case 506: +#line 6095 "fe/idl.ypp" + { (yyval.idlist) = 0; } -#line 8983 "fe/idl.tab.cpp" +#line 9482 "fe/idl.tab.cpp" break; - case 504: -#line 6030 "fe/idl.ypp" - { + case 507: +#line 6102 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_HomeSqSeen); } -#line 8991 "fe/idl.tab.cpp" +#line 9490 "fe/idl.tab.cpp" break; - case 505: -#line 6034 "fe/idl.ypp" - { + case 508: +#line 6106 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_HomeBodySeen); } -#line 8999 "fe/idl.tab.cpp" +#line 9498 "fe/idl.tab.cpp" break; - case 506: -#line 6038 "fe/idl.ypp" - { + case 509: +#line 6110 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_HomeQsSeen); } -#line 9007 "fe/idl.tab.cpp" +#line 9506 "fe/idl.tab.cpp" break; - case 510: -#line 6051 "fe/idl.ypp" - { + case 513: +#line 6123 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_FactoryDeclSeen); } -#line 9015 "fe/idl.tab.cpp" +#line 9514 "fe/idl.tab.cpp" break; - case 511: -#line 6055 "fe/idl.ypp" - { + case 514: +#line 6127 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 9023 "fe/idl.tab.cpp" +#line 9522 "fe/idl.tab.cpp" break; - case 512: -#line 6059 "fe/idl.ypp" - { + case 515: +#line 6131 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_FinderDeclSeen); } -#line 9031 "fe/idl.tab.cpp" +#line 9530 "fe/idl.tab.cpp" break; - case 513: -#line 6063 "fe/idl.ypp" - { + case 516: +#line 6135 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 9039 "fe/idl.tab.cpp" +#line 9538 "fe/idl.tab.cpp" break; - case 514: -#line 6071 "fe/idl.ypp" - { + case 517: +#line 6143 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); @@ -9062,20 +9561,20 @@ yyreduce: */ idl_global->scopes ().push (f); } -#line 9066 "fe/idl.tab.cpp" +#line 9565 "fe/idl.tab.cpp" break; - case 515: -#line 6094 "fe/idl.ypp" - { + case 518: +#line 6166 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 9074 "fe/idl.tab.cpp" +#line 9573 "fe/idl.tab.cpp" break; - case 516: -#line 6098 "fe/idl.ypp" - { + case 519: +#line 6170 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); @@ -9092,12 +9591,12 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 9096 "fe/idl.tab.cpp" +#line 9595 "fe/idl.tab.cpp" break; - case 517: -#line 6120 "fe/idl.ypp" - { + case 520: +#line 6192 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); @@ -9123,20 +9622,20 @@ yyreduce: */ idl_global->scopes ().push (f); } -#line 9127 "fe/idl.tab.cpp" +#line 9626 "fe/idl.tab.cpp" break; - case 518: -#line 6147 "fe/idl.ypp" - { + case 521: +#line 6219 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 9135 "fe/idl.tab.cpp" +#line 9634 "fe/idl.tab.cpp" break; - case 519: -#line 6151 "fe/idl.ypp" - { + case 522: +#line 6223 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); @@ -9153,12 +9652,12 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 9157 "fe/idl.tab.cpp" +#line 9656 "fe/idl.tab.cpp" break; - case 525: -#line 6184 "fe/idl.ypp" - { + case 528: +#line 6256 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); @@ -9182,12 +9681,12 @@ yyreduce: (yyval.dcval) = 0; } -#line 9186 "fe/idl.tab.cpp" +#line 9685 "fe/idl.tab.cpp" break; - case 526: -#line 6214 "fe/idl.ypp" - { + case 529: +#line 6286 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); @@ -9211,12 +9710,12 @@ yyreduce: (yyval.dcval) = 0; } -#line 9215 "fe/idl.tab.cpp" +#line 9714 "fe/idl.tab.cpp" break; - case 527: -#line 6243 "fe/idl.ypp" - { + case 530: +#line 6315 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_EventType *e = 0; AST_Interface *i = 0; @@ -9259,28 +9758,28 @@ yyreduce: delete (yyvsp[-1].idval); (yyvsp[-1].idval) = 0; } -#line 9263 "fe/idl.tab.cpp" +#line 9762 "fe/idl.tab.cpp" break; - case 528: -#line 6287 "fe/idl.ypp" - { + case 531: +#line 6359 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeSqSeen); } -#line 9271 "fe/idl.tab.cpp" +#line 9770 "fe/idl.tab.cpp" break; - case 529: -#line 6291 "fe/idl.ypp" - { + case 532: +#line 6363 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeBodySeen); } -#line 9279 "fe/idl.tab.cpp" +#line 9778 "fe/idl.tab.cpp" break; - case 530: -#line 6295 "fe/idl.ypp" - { + case 533: +#line 6367 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeQsSeen); /* @@ -9290,20 +9789,20 @@ yyreduce: (yyval.dcval) = 0; } -#line 9294 "fe/idl.tab.cpp" +#line 9793 "fe/idl.tab.cpp" break; - case 531: -#line 6311 "fe/idl.ypp" - { + case 534: +#line 6383 "fe/idl.ypp" + { (yyval.idval) = (yyvsp[0].idval); } -#line 9302 "fe/idl.tab.cpp" +#line 9801 "fe/idl.tab.cpp" break; - case 532: -#line 6320 "fe/idl.ypp" - { + case 535: +#line 6392 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeIDSeen); ACE_DEBUG ((LM_DEBUG, @@ -9315,30 +9814,30 @@ yyreduce: ACE_TEXT (" custom yet\n"))); (yyval.idval) = 0; } -#line 9319 "fe/idl.tab.cpp" +#line 9818 "fe/idl.tab.cpp" break; - case 533: -#line 6337 "fe/idl.ypp" - { + case 536: +#line 6409 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 9329 "fe/idl.tab.cpp" +#line 9828 "fe/idl.tab.cpp" break; - case 534: -#line 6346 "fe/idl.ypp" - { + case 537: +#line 6418 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 9337 "fe/idl.tab.cpp" +#line 9836 "fe/idl.tab.cpp" break; - case 535: -#line 6350 "fe/idl.ypp" - { + case 538: +#line 6422 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); ACE_NEW_RETURN ((yyval.vhval), @@ -9366,50 +9865,50 @@ yyreduce: (yyvsp[-2].nlval) = 0; } } -#line 9370 "fe/idl.tab.cpp" +#line 9869 "fe/idl.tab.cpp" break; - case 536: -#line 6383 "fe/idl.ypp" - { - UTL_Scope *s = idl_global->scopes ().top_non_null (); - AST_EventType *e = 0; - AST_Interface *i = 0; + case 539: +#line 6455 "fe/idl.ypp" + { + UTL_Scope *scope = idl_global->scopes ().top_non_null (); + Identifier *&event_id = (yyvsp[-1].idval); + FE_OBVHeader *&event_header = (yyvsp[0].vhval); + AST_EventType *eventtype = 0; - if (s != 0 && (yyvsp[-1].idval) != 0) + if (scope && event_header) { // We create the scoped name here instead of with the - // FE_EventHeader because there is a token for it only here. - UTL_ScopedName sn ((yyvsp[-1].idval), - 0); - e = - idl_global->gen ()->create_eventtype ( - &sn, - (yyvsp[0].vhval)->inherits (), - (yyvsp[0].vhval)->n_inherits (), - (yyvsp[0].vhval)->inherits_concrete (), - (yyvsp[0].vhval)->inherits_flat (), - (yyvsp[0].vhval)->n_inherits_flat (), - (yyvsp[0].vhval)->supports (), - (yyvsp[0].vhval)->n_supports (), - (yyvsp[0].vhval)->supports_concrete (), - false, - (yyvsp[0].vhval)->truncatable (), - false - ); - i = AST_Interface::narrow_from_decl (e); - AST_Interface::fwd_redefinition_helper (i, - s); + // FE_OBVHeader because there is a token for it only here. + UTL_ScopedName sn (event_id, 0); + eventtype = idl_global->gen ()->create_eventtype ( + &sn, + event_header->inherits (), + event_header->n_inherits (), + event_header->inherits_concrete (), + event_header->inherits_flat (), + event_header->n_inherits_flat (), + event_header->supports (), + event_header->n_supports (), + event_header->supports_concrete (), + false, + event_header->truncatable (), + false); + AST_Interface *eventtype_as_interface = + dynamic_cast<AST_Interface *> (eventtype); + AST_Interface::fwd_redefinition_helper ( + eventtype_as_interface, scope); + eventtype = dynamic_cast<AST_EventType *> (eventtype_as_interface); + /* * Add the eventetype to its definition scope */ - e = AST_EventType::narrow_from_decl (i); - (void) s->fe_add_eventtype (e); + scope->fe_add_eventtype (eventtype); - // FE_EventHeader is not automatically destroyed in the AST - (yyvsp[0].vhval)->destroy (); - delete (yyvsp[0].vhval); - (yyvsp[0].vhval) = 0; + // FE_OBVHeader is not automatically destroyed in the AST + event_header->destroy (); + delete event_header; + event_header = 0; sn.destroy (); } @@ -9417,30 +9916,32 @@ yyreduce: /* * Push it on the scope stack. */ - idl_global->scopes ().push (e); + idl_global->scopes ().push (eventtype); + + (yyval.dcval) = eventtype; } -#line 9423 "fe/idl.tab.cpp" +#line 9924 "fe/idl.tab.cpp" break; - case 537: -#line 6432 "fe/idl.ypp" - { + case 540: +#line 6506 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeSqSeen); } -#line 9431 "fe/idl.tab.cpp" +#line 9932 "fe/idl.tab.cpp" break; - case 538: -#line 6436 "fe/idl.ypp" - { + case 541: +#line 6510 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeBodySeen); } -#line 9439 "fe/idl.tab.cpp" +#line 9940 "fe/idl.tab.cpp" break; - case 539: -#line 6440 "fe/idl.ypp" - { + case 542: +#line 6514 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeQsSeen); /* @@ -9448,111 +9949,111 @@ yyreduce: */ idl_global->scopes ().pop (); - (yyval.dcval) = 0; + (yyval.dcval) = (yyvsp[-5].dcval); } -#line 9454 "fe/idl.tab.cpp" +#line 9955 "fe/idl.tab.cpp" break; - case 540: -#line 6454 "fe/idl.ypp" - { + case 543: +#line 6528 "fe/idl.ypp" + { (yyval.idval) = (yyvsp[0].idval); } -#line 9462 "fe/idl.tab.cpp" +#line 9963 "fe/idl.tab.cpp" break; - case 541: -#line 6458 "fe/idl.ypp" - { + case 544: +#line 6532 "fe/idl.ypp" + { (yyval.idval) = (yyvsp[0].idval); } -#line 9470 "fe/idl.tab.cpp" +#line 9971 "fe/idl.tab.cpp" break; - case 542: -#line 6465 "fe/idl.ypp" - { + case 545: +#line 6539 "fe/idl.ypp" + { (yyval.ntval) = AST_Decl::NT_type; } -#line 9478 "fe/idl.tab.cpp" +#line 9979 "fe/idl.tab.cpp" break; - case 543: -#line 6469 "fe/idl.ypp" - { + case 546: +#line 6543 "fe/idl.ypp" + { (yyval.ntval) = AST_Decl::NT_struct; } -#line 9486 "fe/idl.tab.cpp" +#line 9987 "fe/idl.tab.cpp" break; - case 544: -#line 6473 "fe/idl.ypp" - { + case 547: +#line 6547 "fe/idl.ypp" + { (yyval.ntval) = AST_Decl::NT_union; } -#line 9494 "fe/idl.tab.cpp" +#line 9995 "fe/idl.tab.cpp" break; - case 545: -#line 6477 "fe/idl.ypp" - { + case 548: +#line 6551 "fe/idl.ypp" + { (yyval.ntval) = AST_Decl::NT_eventtype; } -#line 9502 "fe/idl.tab.cpp" +#line 10003 "fe/idl.tab.cpp" break; - case 546: -#line 6481 "fe/idl.ypp" - { + case 549: +#line 6555 "fe/idl.ypp" + { (yyval.ntval) = AST_Decl::NT_sequence; } -#line 9510 "fe/idl.tab.cpp" +#line 10011 "fe/idl.tab.cpp" break; - case 547: -#line 6485 "fe/idl.ypp" - { + case 550: +#line 6559 "fe/idl.ypp" + { (yyval.ntval) = AST_Decl::NT_interface; } -#line 9518 "fe/idl.tab.cpp" +#line 10019 "fe/idl.tab.cpp" break; - case 548: -#line 6489 "fe/idl.ypp" - { + case 551: +#line 6563 "fe/idl.ypp" + { (yyval.ntval) = AST_Decl::NT_valuetype; } -#line 9526 "fe/idl.tab.cpp" +#line 10027 "fe/idl.tab.cpp" break; - case 549: -#line 6493 "fe/idl.ypp" - { + case 552: +#line 6567 "fe/idl.ypp" + { (yyval.ntval) = AST_Decl::NT_enum; } -#line 9534 "fe/idl.tab.cpp" +#line 10035 "fe/idl.tab.cpp" break; - case 550: -#line 6497 "fe/idl.ypp" - { + case 553: +#line 6571 "fe/idl.ypp" + { (yyval.ntval) = AST_Decl::NT_except; } -#line 9542 "fe/idl.tab.cpp" +#line 10043 "fe/idl.tab.cpp" break; - case 551: -#line 6501 "fe/idl.ypp" - { + case 554: +#line 6575 "fe/idl.ypp" + { (yyval.ntval) = AST_Decl::NT_const; t_param_const_type = (yyvsp[0].etval); } -#line 9551 "fe/idl.tab.cpp" +#line 10052 "fe/idl.tab.cpp" break; - case 552: -#line 6509 "fe/idl.ypp" - { + case 555: +#line 6583 "fe/idl.ypp" + { if ((yyvsp[0].plval) == 0) { ACE_NEW_RETURN ((yyvsp[0].plval), FE_Utils::T_PARAMLIST_INFO, 1); @@ -9579,12 +10080,12 @@ yyreduce: (yyval.plval) = (yyvsp[0].plval); } -#line 9583 "fe/idl.tab.cpp" +#line 10084 "fe/idl.tab.cpp" break; - case 553: -#line 6540 "fe/idl.ypp" - { + case 556: +#line 6614 "fe/idl.ypp" + { if ((yyvsp[-2].plval) == 0) { ACE_NEW_RETURN ((yyvsp[-2].plval), FE_Utils::T_PARAMLIST_INFO, 1); @@ -9596,20 +10097,20 @@ yyreduce: delete (yyvsp[0].pival); (yyvsp[0].pival) = 0; } -#line 9600 "fe/idl.tab.cpp" +#line 10101 "fe/idl.tab.cpp" break; - case 554: -#line 6553 "fe/idl.ypp" - { + case 557: +#line 6627 "fe/idl.ypp" + { (yyval.plval) = 0; } -#line 9608 "fe/idl.tab.cpp" +#line 10109 "fe/idl.tab.cpp" break; - case 555: -#line 6560 "fe/idl.ypp" - { + case 558: +#line 6634 "fe/idl.ypp" + { ACE_NEW_RETURN ((yyval.pival), FE_Utils::T_Param_Info, @@ -9633,12 +10134,12 @@ yyreduce: tao_enum_constant_decl = 0; } } -#line 9637 "fe/idl.tab.cpp" +#line 10138 "fe/idl.tab.cpp" break; - case 556: -#line 6585 "fe/idl.ypp" - { + case 559: +#line 6659 "fe/idl.ypp" + { ACE_NEW_RETURN ((yyval.pival), FE_Utils::T_Param_Info, 1); @@ -9652,20 +10153,20 @@ yyreduce: ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; } -#line 9656 "fe/idl.tab.cpp" +#line 10157 "fe/idl.tab.cpp" break; - case 557: -#line 6603 "fe/idl.ypp" - { + case 560: +#line 6677 "fe/idl.ypp" + { ACE_NEW_RETURN ((yyval.slval), UTL_StrList ((yyvsp[-1].sval), (yyvsp[0].slval)), 1); } -#line 9664 "fe/idl.tab.cpp" +#line 10165 "fe/idl.tab.cpp" break; - case 558: -#line 6610 "fe/idl.ypp" - { + case 561: +#line 6684 "fe/idl.ypp" + { UTL_StrList *sl = 0; ACE_NEW_RETURN (sl, UTL_StrList ((yyvsp[0].sval), 0), 1); @@ -9679,155 +10180,125 @@ yyreduce: (yyval.slval) = (yyvsp[-2].slval); } } -#line 9683 "fe/idl.tab.cpp" +#line 10184 "fe/idl.tab.cpp" break; - case 559: -#line 6625 "fe/idl.ypp" - { + case 562: +#line 6699 "fe/idl.ypp" + { (yyval.slval) = 0; } -#line 9691 "fe/idl.tab.cpp" +#line 10192 "fe/idl.tab.cpp" break; - case 560: -#line 6632 "fe/idl.ypp" - { + case 563: +#line 6706 "fe/idl.ypp" + { ACE_NEW_RETURN ((yyval.sval), UTL_String ((yyvsp[0].strval), true), 1); } -#line 9701 "fe/idl.tab.cpp" +#line 10202 "fe/idl.tab.cpp" break; - case 561: -#line 6641 "fe/idl.ypp" - { + case 564: +#line 6715 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeSeen); } -#line 9709 "fe/idl.tab.cpp" +#line 10210 "fe/idl.tab.cpp" break; - case 562: -#line 6645 "fe/idl.ypp" - { + case 565: +#line 6719 "fe/idl.ypp" + { + char *&id_value = (yyvsp[0].strval); idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeIDSeen); - UTL_Scope *s = idl_global->scopes ().top_non_null (); - - Identifier id ((yyvsp[0].strval)); - ACE::strdelete ((yyvsp[0].strval)); - (yyvsp[0].strval) = 0; + UTL_Scope *scope = idl_global->scopes ().top_non_null (); - UTL_ScopedName sn (&id, 0); - AST_PortType *p = - idl_global->gen ()->create_porttype (&sn); + Identifier id (id_value); + ACE::strdelete (id_value); + id_value = 0; - (void) s->fe_add_porttype (p); + UTL_ScopedName scoped_name (&id, 0); + AST_PortType *porttype = idl_global->gen ()->create_porttype ( + &scoped_name); + scope->fe_add_porttype (porttype); + (yyval.dcval) = porttype; // Push it on the scopes stack. - idl_global->scopes ().push (p); - - delete (yyvsp[-1].annotations_val); + idl_global->scopes ().push (porttype); } -#line 9733 "fe/idl.tab.cpp" +#line 10233 "fe/idl.tab.cpp" break; - case 563: -#line 6665 "fe/idl.ypp" - { + case 566: +#line 6738 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeSqSeen); } -#line 9741 "fe/idl.tab.cpp" +#line 10241 "fe/idl.tab.cpp" break; - case 564: -#line 6669 "fe/idl.ypp" - { + case 567: +#line 6746 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeBodySeen); } -#line 9749 "fe/idl.tab.cpp" +#line 10249 "fe/idl.tab.cpp" break; - case 565: -#line 6673 "fe/idl.ypp" - { + case 568: +#line 6750 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeQsSeen); // Done with this port type - pop it off the scopes stack. idl_global->scopes ().pop (); - (yyval.dcval) = 0; - } -#line 9762 "fe/idl.tab.cpp" - break; - - case 566: -#line 6685 "fe/idl.ypp" - { - } -#line 9769 "fe/idl.tab.cpp" - break; - - case 567: -#line 6691 "fe/idl.ypp" - { - } -#line 9776 "fe/idl.tab.cpp" - break; - - case 568: -#line 6694 "fe/idl.ypp" - { + (yyval.dcval) = (yyvsp[-5].dcval); } -#line 9783 "fe/idl.tab.cpp" +#line 10262 "fe/idl.tab.cpp" break; case 569: -#line 6700 "fe/idl.ypp" - { - } -#line 9790 "fe/idl.tab.cpp" - break; - - case 570: -#line 6703 "fe/idl.ypp" - { - } -#line 9797 "fe/idl.tab.cpp" - break; - - case 571: -#line 6706 "fe/idl.ypp" - { - } -#line 9804 "fe/idl.tab.cpp" - break; - - case 572: -#line 6709 "fe/idl.ypp" - { +#line 6762 "fe/idl.ypp" + { + AST_Annotation_Appls *&annotations = (yyvsp[-1].annotations_val); + AST_Decl *&node = (yyvsp[0].dcval); + if (node) + { + node->annotation_appls (*annotations); + } + else + { + idl_global->err ()-> unsupported_warning ( + "Annotating this is not supported"); + } + delete annotations; } -#line 9811 "fe/idl.tab.cpp" +#line 10281 "fe/idl.tab.cpp" break; - case 573: -#line 6712 "fe/idl.ypp" - { + case 575: +#line 6788 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 9819 "fe/idl.tab.cpp" +#line 10289 "fe/idl.tab.cpp" break; - case 574: -#line 6716 "fe/idl.ypp" - { + case 576: +#line 6792 "fe/idl.ypp" + { + (yyval.dcval) = (yyvsp[-2].dcval); } -#line 9826 "fe/idl.tab.cpp" +#line 10297 "fe/idl.tab.cpp" break; - case 575: -#line 6722 "fe/idl.ypp" - { + case 577: +#line 6799 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen); UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = @@ -9852,21 +10323,17 @@ yyreduce: } } + AST_Extended_Port *ep = 0; + if (so_far_so_good) { Identifier id ((yyvsp[0].strval)); ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; - UTL_ScopedName sn (&id, - 0); - - AST_Extended_Port *ep = - idl_global->gen ()->create_extended_port ( - &sn, - pt); - - (void) s->fe_add_extended_port (ep); + UTL_ScopedName sn (&id, 0); + ep = idl_global->gen ()->create_extended_port (&sn, pt); + s->fe_add_extended_port (ep); // Create (in the AST) the struct(s) and sequence(s) // needed for multiplex uses ports, if any. @@ -9894,13 +10361,15 @@ yyreduce: (yyvsp[-1].idlist)->destroy (); delete (yyvsp[-1].idlist); (yyvsp[-1].idlist) = 0; + + (yyval.dcval) = ep; } -#line 9899 "fe/idl.tab.cpp" +#line 10368 "fe/idl.tab.cpp" break; - case 576: -#line 6791 "fe/idl.ypp" - { + case 578: +#line 6866 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_MirrorPortDeclSeen); UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = @@ -9925,33 +10394,31 @@ yyreduce: } } + AST_Mirror_Port *mp = 0; + if (so_far_so_good) { Identifier id ((yyvsp[0].strval)); ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; - UTL_ScopedName sn (&id, - 0); - - AST_Mirror_Port *mp = - idl_global->gen ()->create_mirror_port ( - &sn, - pt); - - (void) s->fe_add_mirror_port (mp); + UTL_ScopedName sn (&id, 0); + mp = idl_global->gen ()->create_mirror_port (&sn, pt); + s->fe_add_mirror_port (mp); } (yyvsp[-1].idlist)->destroy (); delete (yyvsp[-1].idlist); (yyvsp[-1].idlist) = 0; + + (yyval.dcval) = mp; } -#line 9950 "fe/idl.tab.cpp" +#line 10417 "fe/idl.tab.cpp" break; - case 577: -#line 6841 "fe/idl.ypp" - { + case 579: +#line 6914 "fe/idl.ypp" + { if ((yyvsp[0].alval) == 0) { ACE_NEW_RETURN ((yyvsp[0].alval), @@ -9963,12 +10430,12 @@ yyreduce: (yyvsp[0].alval)->enqueue_head ((yyvsp[-1].dcval)); (yyval.alval) = (yyvsp[0].alval); } -#line 9967 "fe/idl.tab.cpp" +#line 10434 "fe/idl.tab.cpp" break; - case 578: -#line 6857 "fe/idl.ypp" - { + case 580: +#line 6930 "fe/idl.ypp" + { if ((yyvsp[-3].alval) == 0) { ACE_NEW_RETURN ((yyvsp[-3].alval), @@ -9980,20 +10447,20 @@ yyreduce: (yyvsp[-3].alval)->enqueue_tail ((yyvsp[0].dcval)); (yyval.alval) = (yyvsp[-3].alval); } -#line 9984 "fe/idl.tab.cpp" +#line 10451 "fe/idl.tab.cpp" break; - case 579: -#line 6870 "fe/idl.ypp" - { + case 581: +#line 6943 "fe/idl.ypp" + { (yyval.alval) = 0; } -#line 9992 "fe/idl.tab.cpp" +#line 10459 "fe/idl.tab.cpp" break; - case 580: -#line 6877 "fe/idl.ypp" - { + case 582: +#line 6950 "fe/idl.ypp" + { // To avoid grammar conflicts with this LALR(1) parser, // we take advantage of the fact that an expression can // be a scoped name. At that lower level, we create an @@ -10048,36 +10515,36 @@ yyreduce: 0); } } -#line 10052 "fe/idl.tab.cpp" +#line 10519 "fe/idl.tab.cpp" break; - case 581: -#line 6936 "fe/idl.ypp" - { + case 583: +#line 7009 "fe/idl.ypp" + { (yyval.dcval) = 0; } -#line 10060 "fe/idl.tab.cpp" +#line 10527 "fe/idl.tab.cpp" break; - case 582: -#line 6943 "fe/idl.ypp" - { + case 584: +#line 7016 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorSeen); } -#line 10068 "fe/idl.tab.cpp" +#line 10535 "fe/idl.tab.cpp" break; - case 583: -#line 6947 "fe/idl.ypp" - { + case 585: +#line 7020 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorIDSeen); } -#line 10076 "fe/idl.tab.cpp" +#line 10543 "fe/idl.tab.cpp" break; - case 584: -#line 6951 "fe/idl.ypp" - { + case 586: +#line 7024 "fe/idl.ypp" + { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Connector *parent = 0; bool so_far_so_good = true; @@ -10130,102 +10597,102 @@ yyreduce: delete (yyvsp[-3].annotations_val); } -#line 10134 "fe/idl.tab.cpp" +#line 10601 "fe/idl.tab.cpp" break; - case 585: -#line 7008 "fe/idl.ypp" - { + case 587: +#line 7081 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorSqSeen); } -#line 10142 "fe/idl.tab.cpp" +#line 10609 "fe/idl.tab.cpp" break; - case 586: -#line 7012 "fe/idl.ypp" - { + case 588: +#line 7085 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorBodySeen); } -#line 10150 "fe/idl.tab.cpp" +#line 10617 "fe/idl.tab.cpp" break; - case 587: -#line 7016 "fe/idl.ypp" - { + case 589: +#line 7089 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorQsSeen); // Done with this connector - pop it off the scope stack. idl_global->scopes ().pop (); } -#line 10161 "fe/idl.tab.cpp" +#line 10628 "fe/idl.tab.cpp" break; - case 590: -#line 7031 "fe/idl.ypp" - { + case 592: +#line 7104 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ProvidesDeclSeen); } -#line 10169 "fe/idl.tab.cpp" +#line 10636 "fe/idl.tab.cpp" break; - case 591: -#line 7035 "fe/idl.ypp" - { + case 593: +#line 7108 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10177 "fe/idl.tab.cpp" +#line 10644 "fe/idl.tab.cpp" break; - case 592: -#line 7039 "fe/idl.ypp" - { + case 594: +#line 7112 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_UsesDeclSeen); } -#line 10185 "fe/idl.tab.cpp" +#line 10652 "fe/idl.tab.cpp" break; - case 593: -#line 7043 "fe/idl.ypp" - { + case 595: +#line 7116 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10193 "fe/idl.tab.cpp" +#line 10660 "fe/idl.tab.cpp" break; - case 594: -#line 7047 "fe/idl.ypp" - { + case 596: +#line 7120 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 10201 "fe/idl.tab.cpp" +#line 10668 "fe/idl.tab.cpp" break; - case 595: -#line 7051 "fe/idl.ypp" - { + case 597: +#line 7124 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10209 "fe/idl.tab.cpp" +#line 10676 "fe/idl.tab.cpp" break; - case 596: -#line 7055 "fe/idl.ypp" - { + case 598: +#line 7128 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen); } -#line 10217 "fe/idl.tab.cpp" +#line 10684 "fe/idl.tab.cpp" break; - case 597: -#line 7059 "fe/idl.ypp" - { + case 599: +#line 7132 "fe/idl.ypp" + { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10225 "fe/idl.tab.cpp" +#line 10692 "fe/idl.tab.cpp" break; -#line 10229 "fe/idl.tab.cpp" +#line 10696 "fe/idl.tab.cpp" default: break; } @@ -10240,11 +10707,10 @@ yyreduce: case of YYERROR or YYBACKUP, subsequent parser actions might lead to an incorrect destructor call or verbose syntax error message before the lookahead is translated. */ - YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); + YY_SYMBOL_PRINT ("-> $$ =", YY_CAST (yysymbol_kind_t, yyr1[yyn]), &yyval, &yyloc); YYPOPSTACK (yylen); yylen = 0; - YY_STACK_PRINT (yyss, yyssp); *++yyvsp = yyval; @@ -10268,50 +10734,14 @@ yyreduce: yyerrlab: /* Make sure we have latest lookahead translation. See comments at user semantic actions for why this is necessary. */ - yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar); - + yytoken = yychar == YYEMPTY ? YYSYMBOL_YYEMPTY : YYTRANSLATE (yychar); /* If not already recovering from an error, report this error. */ if (!yyerrstatus) { ++yynerrs; -#if ! YYERROR_VERBOSE yyerror (YY_("syntax error")); -#else -# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ - yyssp, yytoken) - { - char const *yymsgp = YY_("syntax error"); - int yysyntax_error_status; - yysyntax_error_status = YYSYNTAX_ERROR; - if (yysyntax_error_status == 0) - yymsgp = yymsg; - else if (yysyntax_error_status == 1) - { - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); - yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc); - if (!yymsg) - { - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; - yysyntax_error_status = 2; - } - else - { - yysyntax_error_status = YYSYNTAX_ERROR; - yymsgp = yymsg; - } - } - yyerror (yymsgp); - if (yysyntax_error_status == 2) - goto yyexhaustedlab; - } -# undef YYSYNTAX_ERROR -#endif } - - if (yyerrstatus == 3) { /* If just tried and failed to reuse lookahead token after an @@ -10360,13 +10790,14 @@ yyerrorlab: yyerrlab1: yyerrstatus = 3; /* Each real token shifted decrements this. */ + /* Pop stack until we find a state that shifts the error token. */ for (;;) { yyn = yypact[yystate]; if (!yypact_value_is_default (yyn)) { - yyn += YYTERROR; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) + yyn += YYSYMBOL_YYerror; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYSYMBOL_YYerror) { yyn = yytable[yyn]; if (0 < yyn) @@ -10380,7 +10811,7 @@ yyerrlab1: yydestruct ("Error: popping", - yystos[yystate], yyvsp); + YY_ACCESSING_SYMBOL (yystate), yyvsp); YYPOPSTACK (1); yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); @@ -10392,7 +10823,7 @@ yyerrlab1: /* Shift the error token. */ - YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); + YY_SYMBOL_PRINT ("Shifting", YY_ACCESSING_SYMBOL (yyn), yyvsp, yylsp); yystate = yyn; goto yynewstate; @@ -10414,7 +10845,7 @@ yyabortlab: goto yyreturn; -#if !defined yyoverflow || YYERROR_VERBOSE +#if !defined yyoverflow /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ @@ -10444,20 +10875,18 @@ yyreturn: while (yyssp != yyss) { yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp); + YY_ACCESSING_SYMBOL (+*yyssp), yyvsp); YYPOPSTACK (1); } #ifndef yyoverflow if (yyss != yyssa) YYSTACK_FREE (yyss); #endif -#if YYERROR_VERBOSE - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); -#endif + return yyresult; } -#line 7064 "fe/idl.ypp" + +#line 7137 "fe/idl.ypp" /* programs */ diff --git a/TAO/TAO_IDL/fe/idl.tab.hpp b/TAO/TAO_IDL/fe/idl.tab.hpp index df7d731752f..fbe1e9b75cc 100644 --- a/TAO/TAO_IDL/fe/idl.tab.hpp +++ b/TAO/TAO_IDL/fe/idl.tab.hpp @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 3.4. */ +/* A Bison parser, made by GNU Bison 3.6.2. */ /* Bison interface for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation, + Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -31,8 +31,9 @@ This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ -/* Undocumented macros, especially those whose name start with YY_, - are private implementation details. Do not rely on them. */ +/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual, + especially those whose name start with YY_ or yy_. They are + private implementation details that can be changed or removed. */ #ifndef YY_TAO_YY_FE_IDL_TAB_HPP_INCLUDED # define YY_TAO_YY_FE_IDL_TAB_HPP_INCLUDED @@ -44,104 +45,109 @@ extern int tao_yydebug; #endif -/* Token type. */ +/* Token kinds. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE enum yytokentype { - IDENTIFIER = 258, - IDL_CONST = 259, - IDL_MODULE = 260, - IDL_INTERFACE = 261, - IDL_TYPEDEF = 262, - IDL_LONG = 263, - IDL_SHORT = 264, - IDL_UNSIGNED = 265, - IDL_DOUBLE = 266, - IDL_FLOAT = 267, - IDL_CHAR = 268, - IDL_WCHAR = 269, - IDL_OCTET = 270, - IDL_BOOLEAN = 271, - IDL_FIXED = 272, - IDL_ANY = 273, - IDL_OBJECT = 274, - IDL_STRUCT = 275, - IDL_UNION = 276, - IDL_SWITCH = 277, - IDL_ENUM = 278, - IDL_SEQUENCE = 279, - IDL_STRING = 280, - IDL_WSTRING = 281, - IDL_EXCEPTION = 282, - IDL_CASE = 283, - IDL_DEFAULT = 284, - IDL_READONLY = 285, - IDL_ATTRIBUTE = 286, - IDL_ONEWAY = 287, - IDL_IDEMPOTENT = 288, - IDL_VOID = 289, - IDL_IN = 290, - IDL_OUT = 291, - IDL_INOUT = 292, - IDL_RAISES = 293, - IDL_CONTEXT = 294, - IDL_NATIVE = 295, - IDL_LOCAL = 296, - IDL_ABSTRACT = 297, - IDL_CUSTOM = 298, - IDL_FACTORY = 299, - IDL_PRIVATE = 300, - IDL_PUBLIC = 301, - IDL_SUPPORTS = 302, - IDL_TRUNCATABLE = 303, - IDL_VALUETYPE = 304, - IDL_COMPONENT = 305, - IDL_CONSUMES = 306, - IDL_EMITS = 307, - IDL_EVENTTYPE = 308, - IDL_FINDER = 309, - IDL_GETRAISES = 310, - IDL_HOME = 311, - IDL_IMPORT = 312, - IDL_MULTIPLE = 313, - IDL_PRIMARYKEY = 314, - IDL_PROVIDES = 315, - IDL_PUBLISHES = 316, - IDL_SETRAISES = 317, - IDL_TYPEID = 318, - IDL_TYPEPREFIX = 319, - IDL_USES = 320, - IDL_MANAGES = 321, - IDL_TYPENAME = 322, - IDL_PORT = 323, - IDL_MIRRORPORT = 324, - IDL_PORTTYPE = 325, - IDL_CONNECTOR = 326, - IDL_ALIAS = 327, - IDL_INTEGER_LITERAL = 328, - IDL_UINTEGER_LITERAL = 329, - IDL_STRING_LITERAL = 330, - IDL_CHARACTER_LITERAL = 331, - IDL_FLOATING_PT_LITERAL = 332, - IDL_FIXED_PT_LITERAL = 333, - IDL_TRUETOK = 334, - IDL_FALSETOK = 335, - IDL_SCOPE_DELIMITOR = 336, - IDL_LEFT_SHIFT = 337, - IDL_RIGHT_SHIFT = 338, - IDL_WCHAR_LITERAL = 339, - IDL_WSTRING_LITERAL = 340, - IDL_ANNOTATION_DECL = 341, - IDL_ANNOTATION_SYMBOL = 342 + YYEMPTY = -2, + YYEOF = 0, /* "end of file" */ + YYerror = 256, /* error */ + YYUNDEF = 257, /* "invalid token" */ + IDENTIFIER = 258, /* IDENTIFIER */ + IDL_CONST = 259, /* IDL_CONST */ + IDL_MODULE = 260, /* IDL_MODULE */ + IDL_INTERFACE = 261, /* IDL_INTERFACE */ + IDL_TYPEDEF = 262, /* IDL_TYPEDEF */ + IDL_LONG = 263, /* IDL_LONG */ + IDL_SHORT = 264, /* IDL_SHORT */ + IDL_UNSIGNED = 265, /* IDL_UNSIGNED */ + IDL_DOUBLE = 266, /* IDL_DOUBLE */ + IDL_FLOAT = 267, /* IDL_FLOAT */ + IDL_CHAR = 268, /* IDL_CHAR */ + IDL_WCHAR = 269, /* IDL_WCHAR */ + IDL_OCTET = 270, /* IDL_OCTET */ + IDL_BOOLEAN = 271, /* IDL_BOOLEAN */ + IDL_FIXED = 272, /* IDL_FIXED */ + IDL_ANY = 273, /* IDL_ANY */ + IDL_OBJECT = 274, /* IDL_OBJECT */ + IDL_STRUCT = 275, /* IDL_STRUCT */ + IDL_UNION = 276, /* IDL_UNION */ + IDL_SWITCH = 277, /* IDL_SWITCH */ + IDL_ENUM = 278, /* IDL_ENUM */ + IDL_SEQUENCE = 279, /* IDL_SEQUENCE */ + IDL_STRING = 280, /* IDL_STRING */ + IDL_WSTRING = 281, /* IDL_WSTRING */ + IDL_EXCEPTION = 282, /* IDL_EXCEPTION */ + IDL_CASE = 283, /* IDL_CASE */ + IDL_DEFAULT = 284, /* IDL_DEFAULT */ + IDL_READONLY = 285, /* IDL_READONLY */ + IDL_ATTRIBUTE = 286, /* IDL_ATTRIBUTE */ + IDL_ONEWAY = 287, /* IDL_ONEWAY */ + IDL_IDEMPOTENT = 288, /* IDL_IDEMPOTENT */ + IDL_VOID = 289, /* IDL_VOID */ + IDL_IN = 290, /* IDL_IN */ + IDL_OUT = 291, /* IDL_OUT */ + IDL_INOUT = 292, /* IDL_INOUT */ + IDL_RAISES = 293, /* IDL_RAISES */ + IDL_CONTEXT = 294, /* IDL_CONTEXT */ + IDL_NATIVE = 295, /* IDL_NATIVE */ + IDL_LOCAL = 296, /* IDL_LOCAL */ + IDL_ABSTRACT = 297, /* IDL_ABSTRACT */ + IDL_CUSTOM = 298, /* IDL_CUSTOM */ + IDL_FACTORY = 299, /* IDL_FACTORY */ + IDL_PRIVATE = 300, /* IDL_PRIVATE */ + IDL_PUBLIC = 301, /* IDL_PUBLIC */ + IDL_SUPPORTS = 302, /* IDL_SUPPORTS */ + IDL_TRUNCATABLE = 303, /* IDL_TRUNCATABLE */ + IDL_VALUETYPE = 304, /* IDL_VALUETYPE */ + IDL_COMPONENT = 305, /* IDL_COMPONENT */ + IDL_CONSUMES = 306, /* IDL_CONSUMES */ + IDL_EMITS = 307, /* IDL_EMITS */ + IDL_EVENTTYPE = 308, /* IDL_EVENTTYPE */ + IDL_FINDER = 309, /* IDL_FINDER */ + IDL_GETRAISES = 310, /* IDL_GETRAISES */ + IDL_HOME = 311, /* IDL_HOME */ + IDL_IMPORT = 312, /* IDL_IMPORT */ + IDL_MULTIPLE = 313, /* IDL_MULTIPLE */ + IDL_PRIMARYKEY = 314, /* IDL_PRIMARYKEY */ + IDL_PROVIDES = 315, /* IDL_PROVIDES */ + IDL_PUBLISHES = 316, /* IDL_PUBLISHES */ + IDL_SETRAISES = 317, /* IDL_SETRAISES */ + IDL_TYPEID = 318, /* IDL_TYPEID */ + IDL_TYPEPREFIX = 319, /* IDL_TYPEPREFIX */ + IDL_USES = 320, /* IDL_USES */ + IDL_MANAGES = 321, /* IDL_MANAGES */ + IDL_TYPENAME = 322, /* IDL_TYPENAME */ + IDL_PORT = 323, /* IDL_PORT */ + IDL_MIRRORPORT = 324, /* IDL_MIRRORPORT */ + IDL_PORTTYPE = 325, /* IDL_PORTTYPE */ + IDL_CONNECTOR = 326, /* IDL_CONNECTOR */ + IDL_ALIAS = 327, /* IDL_ALIAS */ + IDL_INTEGER_LITERAL = 328, /* IDL_INTEGER_LITERAL */ + IDL_UINTEGER_LITERAL = 329, /* IDL_UINTEGER_LITERAL */ + IDL_STRING_LITERAL = 330, /* IDL_STRING_LITERAL */ + IDL_CHARACTER_LITERAL = 331, /* IDL_CHARACTER_LITERAL */ + IDL_FLOATING_PT_LITERAL = 332, /* IDL_FLOATING_PT_LITERAL */ + IDL_FIXED_PT_LITERAL = 333, /* IDL_FIXED_PT_LITERAL */ + IDL_TRUETOK = 334, /* IDL_TRUETOK */ + IDL_FALSETOK = 335, /* IDL_FALSETOK */ + IDL_SCOPE_DELIMITOR = 336, /* IDL_SCOPE_DELIMITOR */ + IDL_LEFT_SHIFT = 337, /* IDL_LEFT_SHIFT */ + IDL_RIGHT_SHIFT = 338, /* IDL_RIGHT_SHIFT */ + IDL_WCHAR_LITERAL = 339, /* IDL_WCHAR_LITERAL */ + IDL_WSTRING_LITERAL = 340, /* IDL_WSTRING_LITERAL */ + IDL_ANNOTATION_DECL = 341, /* IDL_ANNOTATION_DECL */ + IDL_ANNOTATION_SYMBOL = 342 /* IDL_ANNOTATION_SYMBOL */ }; + typedef enum yytokentype yytoken_kind_t; #endif /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED union YYSTYPE { -#line 162 "fe/idl.ypp" +#line 163 "fe/idl.ypp" AST_Decl *dcval; /* Decl value */ UTL_StrList *slval; /* String list */ @@ -186,7 +192,7 @@ union YYSTYPE AST_Decls *decls_val; Decl_Annotations_Pair *decl_annotations_pair_val; -#line 190 "fe/idl.tab.hpp" +#line 196 "fe/idl.tab.hpp" }; typedef union YYSTYPE YYSTYPE; diff --git a/TAO/TAO_IDL/fe/idl.ypp b/TAO/TAO_IDL/fe/idl.ypp index 478d2668d3f..a2f6d5ae21b 100644 --- a/TAO/TAO_IDL/fe/idl.ypp +++ b/TAO/TAO_IDL/fe/idl.ypp @@ -70,73 +70,74 @@ trademarks or registered trademarks of Sun Microsystems, Inc. /* Declarations */ %{ -#include "utl_identifier.h" -#include "utl_err.h" -#include "utl_string.h" -#include "utl_strlist.h" -#include "utl_namelist.h" -#include "utl_exprlist.h" -#include "utl_labellist.h" -#include "utl_decllist.h" - -#include "global_extern.h" -#include "nr_extern.h" - -#include "ast_argument.h" -#include "ast_array.h" -#include "ast_attribute.h" -#include "ast_field.h" -#include "ast_fixed.h" -#include "ast_expression.h" -#include "ast_operation.h" -#include "ast_generator.h" -#include "ast_template_module.h" -#include "ast_template_module_inst.h" -#include "ast_template_module_ref.h" -#include "ast_typedef.h" -#include "ast_valuebox.h" -#include "ast_valuetype.h" -#include "ast_valuetype_fwd.h" -#include "ast_eventtype.h" -#include "ast_eventtype_fwd.h" -#include "ast_component.h" -#include "ast_component_fwd.h" -#include "ast_home.h" -#include "ast_porttype.h" -#include "ast_connector.h" -#include "ast_uses.h" -#include "ast_constant.h" -#include "ast_union.h" -#include "ast_union_fwd.h" -#include "ast_structure_fwd.h" -#include "ast_extern.h" -#include "ast_enum.h" -#include "ast_root.h" -#include "ast_sequence.h" -#include "ast_string.h" -#include "ast_factory.h" -#include "ast_finder.h" -#include "ast_exception.h" -#include "ast_param_holder.h" -#include "ast_visitor_tmpl_module_inst.h" -#include "ast_visitor_tmpl_module_ref.h" -#include "ast_visitor_context.h" -#include "ast_annotation_appl.h" -#include "ast_union_branch.h" -#include "ast_enum_val.h" -#include "ast_annotation_member.h" - -#include "fe_declarator.h" -#include "fe_interface_header.h" -#include "fe_obv_header.h" -#include "fe_component_header.h" -#include "fe_home_header.h" -#include "fe_utils.h" - -#if (defined(apollo) || defined(hpux)) && defined(__cplusplus) -extern "C" int tao_yywrap(); -#endif // (defined(apollo) || defined(hpux)) && defined(__cplusplus) - +#include <utl_identifier.h> +#include <utl_err.h> +#include <utl_string.h> +#include <utl_strlist.h> +#include <utl_namelist.h> +#include <utl_exprlist.h> +#include <utl_labellist.h> +#include <utl_decllist.h> + +#include <global_extern.h> +#include <nr_extern.h> + +#include <ast_argument.h> +#include <ast_array.h> +#include <ast_attribute.h> +#include <ast_field.h> +#include <ast_fixed.h> +#include <ast_expression.h> +#include <ast_operation.h> +#include <ast_generator.h> +#include <ast_template_module.h> +#include <ast_template_module_inst.h> +#include <ast_template_module_ref.h> +#include <ast_typedef.h> +#include <ast_valuebox.h> +#include <ast_valuetype.h> +#include <ast_valuetype_fwd.h> +#include <ast_eventtype.h> +#include <ast_eventtype_fwd.h> +#include <ast_component.h> +#include <ast_component_fwd.h> +#include <ast_home.h> +#include <ast_porttype.h> +#include <ast_connector.h> +#include <ast_uses.h> +#include <ast_constant.h> +#include <ast_union.h> +#include <ast_union_fwd.h> +#include <ast_structure_fwd.h> +#include <ast_extern.h> +#include <ast_enum.h> +#include <ast_root.h> +#include <ast_sequence.h> +#include <ast_string.h> +#include <ast_factory.h> +#include <ast_finder.h> +#include <ast_exception.h> +#include <ast_param_holder.h> +#include <ast_visitor_tmpl_module_inst.h> +#include <ast_visitor_tmpl_module_ref.h> +#include <ast_visitor_context.h> +#include <ast_annotation_appl.h> +#include <ast_union_branch.h> +#include <ast_enum_val.h> +#include <ast_annotation_member.h> +#include <ast_provides.h> +#include <ast_emits.h> +#include <ast_publishes.h> +#include <ast_consumes.h> +#include <ast_extended_port.h> +#include <ast_mirror_port.h> + +#include <fe_declarator.h> +#include <fe_interface_header.h> +#include <fe_obv_header.h> +#include <fe_component_header.h> +#include <fe_home_header.h> +#include <fe_utils.h> void tao_yyerror (const char *); int tao_yylex (void); @@ -321,6 +322,9 @@ bool stack_based_lookup_for_primary_expr = false; %type <dcval> porttype_decl connector_decl value_def %type <dcval> valuetype value_abs_decl value_forward_decl value_box_decl %type <dcval> value_concrete_decl component_forward_decl component_decl +%type <dcval> init_decl provides_decl uses_decl port_export +%type <dcval> component_export emits_decl publishes_decl consumes_decl +%type <dcval> extended_port_decl %type <idlist> scoped_name interface_type component_inheritance_spec %type <idlist> home_inheritance_spec primary_key_spec module_header @@ -390,8 +394,8 @@ bool stack_based_lookup_for_primary_expr = false; %type <annotation_param_val> named_annotation_appl_param %type <decl_annotations_pair_val> seq_head -%type <decls_val> member_i; -%type <vival> visibility; +%type <decls_val> member_i state_member value_element +%type <vival> visibility %% /* @@ -406,27 +410,25 @@ definitions at_least_one_definition /* - * This is broken up into 2 rules to avoid a grammer ambiguity caused - * by annotations which causes shift/reduce conflicts in bison. + * This is broken up into 2 rules to avoid a grammer ambiguity which + * manifests as bison complaining about shift/reduce conflicts. */ : definitions at_least_one_annotation definition { - AST_Annotation_Appls *annotations = $2; - AST_Decl *d = $3; - if (d) + AST_Annotation_Appls *&annotations = $2; + AST_Decl *&node = $3; + if (node) { - d->annotation_appls (*annotations); + node->annotation_appls (*annotations); } else { - idl_global->err ()-> unsupported_warning( + idl_global->err ()-> unsupported_warning ( "Annotating this is not supported"); } delete annotations; } | definitions definition - { - } ; definition @@ -550,7 +552,7 @@ fixed_definition } | error { - idl_global->err()->syntax_error (idl_global->parse_state()); + idl_global->err ()->syntax_error (idl_global->parse_state ()); } ';' { @@ -960,7 +962,7 @@ interface { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceQsSeen); - $$ = dynamic_cast<AST_Decl*> (idl_global->scopes ().top_non_null ()); + $$ = dynamic_cast<AST_Decl *> (idl_global->scopes ().top_non_null ()); /* * Done with this interface - pop it off the scopes stack */ @@ -1106,7 +1108,7 @@ valuetype : IDL_CUSTOM value_concrete_decl { idl_global->err ()->unsupported_error ("custom is not supported"); - $$ = 0; + $<dcval>$ = $2; } | value_concrete_decl ; @@ -1114,46 +1116,50 @@ valuetype value_concrete_decl : value_header { - UTL_Scope *s = idl_global->scopes ().top_non_null (); - AST_ValueType *v = 0; - AST_Interface *i = 0; - - if (s != 0 && $1 != 0) - { - v = - idl_global->gen ()->create_valuetype ( - $1->name (), - $1->inherits (), - $1->n_inherits (), - $1->inherits_concrete (), - $1->inherits_flat (), - $1->n_inherits_flat (), - $1->supports (), - $1->n_supports (), - $1->supports_concrete (), - false, - $1->truncatable (), - false); + FE_OBVHeader *&valuetype_header = $1; + UTL_Scope *scope = idl_global->scopes ().top_non_null (); + AST_ValueType *valuetype = 0; + + if (scope && valuetype_header) + { + valuetype = idl_global->gen ()->create_valuetype ( + valuetype_header->name (), + valuetype_header->inherits (), + valuetype_header->n_inherits (), + valuetype_header->inherits_concrete (), + valuetype_header->inherits_flat (), + valuetype_header->n_inherits_flat (), + valuetype_header->supports (), + valuetype_header->n_supports (), + valuetype_header->supports_concrete (), + false, + valuetype_header->truncatable (), + false); + + AST_Interface *valuetype_as_interface = + dynamic_cast<AST_Interface *> (valuetype); + AST_Interface::fwd_redefinition_helper ( + valuetype_as_interface, scope); + valuetype = dynamic_cast<AST_ValueType *> ( + valuetype_as_interface); - i = AST_Interface::narrow_from_decl (v); - AST_Interface::fwd_redefinition_helper (i, - s); /* * Add the valuetype to its definition scope */ - v = AST_ValueType::narrow_from_decl (i); - (void) s->fe_add_valuetype (v); + scope->fe_add_valuetype (valuetype); // FE_OBVHeader is not automatically destroyed in the AST - $1->destroy (); - delete $1; - $1 = 0; + valuetype_header->destroy (); + delete valuetype_header; + valuetype_header = 0; } /* * Push it on the scope stack */ - idl_global->scopes ().push (v); + idl_global->scopes ().push (valuetype); + + $<dcval>$ = valuetype; } '{' { @@ -1182,7 +1188,7 @@ value_concrete_decl : */ idl_global->scopes ().pop (); - $$ = 0; + $$ = $<dcval>2; } ; @@ -1446,15 +1452,60 @@ value_box_decl ; value_elements - : value_elements value_element + : value_elements at_least_one_annotation value_element + { + AST_Annotation_Appls *&annotations = $2; + AST_Decls *&decls = $3; + if (decls) + { + for (size_t i = 0; i < decls->size (); i++) + { + (*decls)[i]->annotation_appls (*annotations); + } + } + else + { + idl_global->err ()-> unsupported_warning ( + "Annotating this is not supported"); + } + delete annotations; + delete decls; + } + | value_elements value_element + { + delete $2; + } | %empty ; value_element : state_member | export + { + AST_Decl *&node = $1; + AST_Decls *value = 0; + if (node) + { + value = new AST_Decls; + value->push_back (node); + } + $$ = value; + } | init_decl + { + AST_Decl *&node = $1; + AST_Decls *value = 0; + if (node) + { + value = new AST_Decls; + value->push_back (node); + } + $<decls_val>$ = value; + } ';' + { + $$ = $<decls_val>2; + } ; visibility @@ -1471,19 +1522,21 @@ visibility state_member : visibility member_i { - if ($2) + AST_Field::Visibility &visibility = $1; + AST_Decls *&decls_ptr = $2; + if (decls_ptr) { - AST_Decls &decls = *$2; + AST_Decls &decls = *decls_ptr; for (size_t i = 0; i < decls.size (); i++) { - AST_Field * field = dynamic_cast<AST_Field*>(decls[i]); + AST_Field *field = dynamic_cast<AST_Field *> (decls[i]); if (field) { - field->visibility ($1); + field->visibility (visibility); } } } - delete $2; + $$ = decls_ptr; } ; @@ -1503,14 +1556,12 @@ at_least_one_export } else { - idl_global->err ()-> unsupported_warning( + idl_global->err ()-> unsupported_warning ( "Annotating this is not supported"); } delete annotations; } | exports export - { - } ; export @@ -1544,7 +1595,7 @@ export } ';' { - idl_global->set_parse_state(IDL_GlobalData::PS_NoState); + idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } | exception { @@ -1572,7 +1623,7 @@ export } | error { - idl_global->err()->syntax_error (idl_global->parse_state()); + idl_global->err ()->syntax_error (idl_global->parse_state ()); } ';' { @@ -1801,7 +1852,7 @@ interface_forward : delete $2; $2 = 0; - $$ = dynamic_cast<AST_Decl*>(f); + $$ = dynamic_cast<AST_Decl *> (f); } ; @@ -2094,7 +2145,7 @@ unary_expr | '-' primary_expr { $$ = - idl_global->gen()->create_expr ( + idl_global->gen ()->create_expr ( AST_Expression::EC_u_minus, $2, 0 @@ -2103,7 +2154,7 @@ unary_expr | '~' primary_expr { $$ = - idl_global->gen()->create_expr ( + idl_global->gen ()->create_expr ( AST_Expression::EC_bit_neg, $2, 0 @@ -3161,7 +3212,7 @@ member_i : } | error { - idl_global->err()->syntax_error (idl_global->parse_state ()); + idl_global->err ()->syntax_error (idl_global->parse_state ()); } ';' { @@ -3506,7 +3557,7 @@ case_branch : } | error { - idl_global->err()->syntax_error (idl_global->parse_state()); + idl_global->err ()->syntax_error (idl_global->parse_state ()); } ';' { @@ -3576,7 +3627,7 @@ case_label { idl_global->set_parse_state (IDL_GlobalData::PS_LabelColonSeen); - $$ = idl_global->gen()->create_union_label ( + $$ = idl_global->gen ()->create_union_label ( AST_UnionLabel::UL_label, $3 ); @@ -3598,8 +3649,7 @@ element_spec : if ($1 != 0 && AST_illegal_recursive_type ($1)) { - idl_global->err()->error1 (UTL_Error::EIDL_RECURSIVE_TYPE, - $1); + idl_global->err ()->error1 (UTL_Error::EIDL_RECURSIVE_TYPE, $1); $$ = 0; } @@ -3825,7 +3875,7 @@ sequence_type_spec /* * Remove sequence marker from scopes stack. */ - if (idl_global->scopes ().top() == 0) + if (idl_global->scopes ().top () == 0) { idl_global->scopes ().pop (); } @@ -3879,11 +3929,7 @@ sequence_type_spec ); seq->base_type_annotations (*type_annotations); - if (!idl_global->in_typedef () - && !idl_global->anon_silent ()) - { - idl_global->err ()->anonymous_type_diagnostic (); - } + idl_global->err ()->anonymous_type_diagnostic (); } } @@ -3948,11 +3994,7 @@ sequence_type_spec ); seq->base_type_annotations (*type_annotations); - if (!idl_global->in_typedef () - && !idl_global->anon_silent ()) - { - idl_global->err ()->anonymous_type_diagnostic (); - } + idl_global->err ()->anonymous_type_diagnostic (); } } @@ -4034,10 +4076,7 @@ string_type_spec AST_String::narrow_from_decl ( tao_string_decl)); - if (!idl_global->in_typedef () && !idl_global->anon_silent ()) - { - idl_global->err ()->anonymous_type_diagnostic (); - } + idl_global->err ()->anonymous_type_diagnostic (); $$ = tao_string_decl; } @@ -4112,10 +4151,7 @@ wstring_type_spec AST_String::narrow_from_decl ( string)); - if (!idl_global->in_typedef () && !idl_global->anon_silent ()) - { - idl_global->err ()->anonymous_type_diagnostic (); - } + idl_global->err ()->anonymous_type_diagnostic (); $$ = string; } @@ -4183,11 +4219,7 @@ array_declarator : array->base_type_annotations (*base_type_annotations); sn.destroy (); - if (!idl_global->in_typedef () - && !idl_global->anon_silent ()) - { - idl_global->err ()->anonymous_type_diagnostic (); - } + idl_global->err ()->anonymous_type_diagnostic (); } array_dims->destroy (); @@ -4462,32 +4494,35 @@ exception : } defining_id { - UTL_Scope *s = idl_global->scopes ().top_non_null (); - UTL_ScopedName n ($3, - 0); - AST_Exception *e = 0; + Identifier *&id = $3; + UTL_Scope *scope = idl_global->scopes ().top_non_null (); + UTL_ScopedName scoped_name (id, 0); + AST_Exception *exception = 0; idl_global->set_parse_state (IDL_GlobalData::PS_ExceptIDSeen); /* * Create a node representing an exception and add it to * the enclosing scope. */ - if (s != 0) + if (scope) { - e = idl_global->gen ()->create_exception (&n, - s->is_local (), - s->is_abstract ()); - (void) s->fe_add_exception (e); + exception = idl_global->gen ()->create_exception ( + &scoped_name, + scope->is_local (), + scope->is_abstract ()); + scope->fe_add_exception (exception); } /* * Push the exception scope on the scope stack. */ - idl_global->scopes ().push (e); + idl_global->scopes ().push (exception); - $3->destroy (); - delete $3; - $3 = 0; + id->destroy (); + delete id; + id = 0; + + $<dcval>$ = exception; } '{' { @@ -4505,7 +4540,7 @@ exception : */ idl_global->scopes ().pop (); - $$ = 0; + $$ = $<dcval>4; } ; @@ -4650,7 +4685,7 @@ init_decl //@@ PS_FactorySeen? idl_global->set_parse_state (IDL_GlobalData::PS_OpTypeSeen); } - annotations_maybe IDENTIFIER + IDENTIFIER { UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -4667,9 +4702,9 @@ init_decl idl_global->set_err_count (idl_global->err_count () + 1); } - Identifier id ($4); - ACE::strdelete ($4); - $4 = 0; + Identifier id ($3); + ACE::strdelete ($3); + $3 = 0; UTL_ScopedName n (&id, 0); @@ -4691,7 +4726,7 @@ init_decl */ idl_global->scopes ().push (factory); - delete $3; + $<dcval>$ = factory; } init_parameter_list { @@ -4701,14 +4736,16 @@ init_decl { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); - if ($8 != 0) + if ($7) { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Factory *f = AST_Factory::narrow_from_scope (s); - (void) f->fe_add_exceptions ($8); + (void) f->fe_add_exceptions ($7); } idl_global->scopes ().pop (); + + $$ = $<dcval>4; } ; @@ -5231,42 +5268,45 @@ component_forward_decl : component_decl : component_header { - UTL_Scope *s = idl_global->scopes ().top_non_null (); - AST_Component *c = 0; + FE_ComponentHeader *&component_header = $1; + UTL_Scope *scope = idl_global->scopes ().top_non_null (); + AST_Component *component = 0; /* * Make a new component node and add it to the enclosing scope. */ - if (s != 0 && $1 != 0) - { - c = - idl_global->gen ()->create_component ( - $1->name (), - $1->base_component (), - $1->supports (), - $1->n_supports (), - $1->supports_flat (), - $1->n_supports_flat () - ); - AST_Interface *i = AST_Interface::narrow_from_decl (c); - AST_Interface::fwd_redefinition_helper (i, - s); + if (scope && component_header) + { + component = idl_global->gen ()->create_component ( + component_header->name (), + component_header->base_component (), + component_header->supports (), + component_header->n_supports (), + component_header->supports_flat (), + component_header->n_supports_flat ()); + AST_Interface *component_as_interface = + dynamic_cast<AST_Interface *> (component); + AST_Interface::fwd_redefinition_helper ( + component_as_interface, scope); + component = dynamic_cast<AST_Component *> (component_as_interface); + /* * Add the component to its definition scope. */ - c = AST_Component::narrow_from_decl (i); - (void) s->fe_add_component (c); + scope->fe_add_component (component); // This FE_ComponentHeader class isn't destroyed with the AST. - $1->destroy (); - delete $1; - $1 = 0; + component_header->destroy (); + delete component_header; + component_header = 0; } /* * Push it on the scope stack. */ - idl_global->scopes ().push (c); + idl_global->scopes ().push (component); + + $<dcval>$ = component; } '{' { @@ -5285,7 +5325,7 @@ component_decl : */ idl_global->scopes ().pop (); - $$ = 0; + $$ = $<dcval>2; } ; @@ -5340,7 +5380,7 @@ component_inheritance_spec { idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen); } - scoped_name + scoped_name { $<idlist>$ = $3; } @@ -5351,7 +5391,22 @@ component_inheritance_spec ; component_exports - : component_exports component_export + : component_exports at_least_one_annotation component_export + { + AST_Annotation_Appls *&annotations = $2; + AST_Decl *&node = $3; + if (node) + { + node->annotation_appls (*annotations); + } + else + { + idl_global->err ()-> unsupported_warning ( + "Annotating this is not supported"); + } + delete annotations; + } + | component_exports component_export | %empty ; @@ -5363,6 +5418,7 @@ component_export ';' { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); + $$ = $1; } | uses_decl { @@ -5371,6 +5427,7 @@ component_export ';' { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); + $$ = $1; } | emits_decl { @@ -5379,6 +5436,7 @@ component_export ';' { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); + $$ = $1; } | publishes_decl { @@ -5387,6 +5445,7 @@ component_export ';' { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); + $$ = $1; } | consumes_decl { @@ -5395,6 +5454,7 @@ component_export ';' { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); + $$ = $1; } | attribute { @@ -5403,6 +5463,7 @@ component_export ';' { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); + $$ = $1; } | extended_port_decl { @@ -5411,6 +5472,7 @@ component_export ';' { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); + $$ = $1; } ; @@ -5475,6 +5537,8 @@ provides_decl : IDL_PROVIDES interface_type id } } + AST_Provides *provides = 0; + if (so_far_so_good) { AST_Type *port_interface_type = @@ -5486,11 +5550,10 @@ provides_decl : IDL_PROVIDES interface_type id UTL_ScopedName sn ($3, 0); - AST_Provides *p = - idl_global->gen ()->create_provides (&sn, - port_interface_type); + provides = idl_global->gen ()->create_provides ( + &sn, port_interface_type); - (void) s->fe_add_provides (p); + (void) s->fe_add_provides (provides); } $2->destroy (); @@ -5500,6 +5563,8 @@ provides_decl : IDL_PROVIDES interface_type id $3->destroy (); delete $3; $3 = 0; + + $$ = dynamic_cast<AST_Decl *> (provides); } ; @@ -5596,6 +5661,8 @@ uses_decl : uses_opt_multiple interface_type id } } + AST_Uses *uses = 0; + if (so_far_so_good) { AST_Type *port_interface_type = @@ -5607,18 +5674,15 @@ uses_decl : uses_opt_multiple interface_type id UTL_ScopedName sn ($3, 0); - AST_Uses *u = - idl_global->gen ()->create_uses (&sn, - port_interface_type, - $1); - - (void) s->fe_add_uses (u); + uses = idl_global->gen ()->create_uses ( + &sn, port_interface_type, $1); + s->fe_add_uses (uses); AST_Component *c = AST_Component::narrow_from_scope (s); if (c != 0 - && u->is_multiple () + && uses->is_multiple () && !idl_global->using_ifr_backend () && !idl_global->ignore_idl3 () && nt != AST_Decl::NT_param_holder) @@ -5626,7 +5690,7 @@ uses_decl : uses_opt_multiple interface_type id // These datatypes must be created in the // front end so they can be looked up // when compiling the generated executor IDL. - FE_Utils::create_uses_multiple_stuff (c, u); + FE_Utils::create_uses_multiple_stuff (c, uses); } } @@ -5637,6 +5701,8 @@ uses_decl : uses_opt_multiple interface_type id $3->destroy (); delete $3; $3 = 0; + + $$ = uses; } ; @@ -5660,7 +5726,8 @@ opt_multiple } ; -emits_decl : IDL_EMITS scoped_name id +emits_decl + : IDL_EMITS scoped_name id { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -5704,6 +5771,8 @@ emits_decl : IDL_EMITS scoped_name id } } + AST_Emits *e = 0; + if (so_far_so_good) { AST_Type *event_type = @@ -5715,9 +5784,7 @@ emits_decl : IDL_EMITS scoped_name id UTL_ScopedName sn ($3, 0); - AST_Emits *e = - idl_global->gen ()->create_emits (&sn, - event_type); + e = idl_global->gen ()->create_emits (&sn, event_type); (void) s->fe_add_emits (e); } @@ -5729,10 +5796,13 @@ emits_decl : IDL_EMITS scoped_name id $3->destroy (); delete $3; $3 = 0; + + $$ = e; } ; -publishes_decl : IDL_PUBLISHES scoped_name id +publishes_decl + : IDL_PUBLISHES scoped_name id { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -5776,6 +5846,8 @@ publishes_decl : IDL_PUBLISHES scoped_name id } } + AST_Publishes *p = 0; + if (so_far_so_good) { AST_Type *event_type = @@ -5784,14 +5856,9 @@ publishes_decl : IDL_PUBLISHES scoped_name id // Strip off _cxx_, if any, for port name. FE_Utils::original_local_name ($3); - UTL_ScopedName sn ($3, - 0); - - AST_Publishes *p = - idl_global->gen ()->create_publishes (&sn, - event_type); - - (void) s->fe_add_publishes (p); + UTL_ScopedName sn ($3, 0); + p = idl_global->gen ()->create_publishes (&sn, event_type); + s->fe_add_publishes (p); } $2->destroy (); @@ -5801,10 +5868,13 @@ publishes_decl : IDL_PUBLISHES scoped_name id $3->destroy (); delete $3; $3 = 0; + + $$ = p; } ; -consumes_decl : IDL_CONSUMES scoped_name id +consumes_decl + : IDL_CONSUMES scoped_name id { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -5848,6 +5918,8 @@ consumes_decl : IDL_CONSUMES scoped_name id } } + AST_Consumes *c = 0; + if (so_far_so_good) { AST_Type *event_type = @@ -5859,9 +5931,7 @@ consumes_decl : IDL_CONSUMES scoped_name id UTL_ScopedName sn ($3, 0); - AST_Consumes *c = - idl_global->gen ()->create_consumes (&sn, - event_type); + c = idl_global->gen ()->create_consumes (&sn, event_type); (void) s->fe_add_consumes (c); } @@ -5873,11 +5943,13 @@ consumes_decl : IDL_CONSUMES scoped_name id $3->destroy (); delete $3; $3 = 0; + + $$ = c; } - ; + ; -home_decl : - home_header +home_decl + : home_header { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Home *h = 0; @@ -5925,8 +5997,8 @@ home_decl : } ; -home_header : - IDL_HOME +home_header + : IDL_HOME { idl_global->set_parse_state (IDL_GlobalData::PS_HomeSeen); } @@ -6381,44 +6453,44 @@ event_decl : event_header event_rest_of_header { - UTL_Scope *s = idl_global->scopes ().top_non_null (); - AST_EventType *e = 0; - AST_Interface *i = 0; + UTL_Scope *scope = idl_global->scopes ().top_non_null (); + Identifier *&event_id = $1; + FE_OBVHeader *&event_header = $2; + AST_EventType *eventtype = 0; - if (s != 0 && $1 != 0) + if (scope && event_header) { // We create the scoped name here instead of with the - // FE_EventHeader because there is a token for it only here. - UTL_ScopedName sn ($1, - 0); - e = - idl_global->gen ()->create_eventtype ( - &sn, - $2->inherits (), - $2->n_inherits (), - $2->inherits_concrete (), - $2->inherits_flat (), - $2->n_inherits_flat (), - $2->supports (), - $2->n_supports (), - $2->supports_concrete (), - false, - $2->truncatable (), - false - ); - i = AST_Interface::narrow_from_decl (e); - AST_Interface::fwd_redefinition_helper (i, - s); + // FE_OBVHeader because there is a token for it only here. + UTL_ScopedName sn (event_id, 0); + eventtype = idl_global->gen ()->create_eventtype ( + &sn, + event_header->inherits (), + event_header->n_inherits (), + event_header->inherits_concrete (), + event_header->inherits_flat (), + event_header->n_inherits_flat (), + event_header->supports (), + event_header->n_supports (), + event_header->supports_concrete (), + false, + event_header->truncatable (), + false); + AST_Interface *eventtype_as_interface = + dynamic_cast<AST_Interface *> (eventtype); + AST_Interface::fwd_redefinition_helper ( + eventtype_as_interface, scope); + eventtype = dynamic_cast<AST_EventType *> (eventtype_as_interface); + /* * Add the eventetype to its definition scope */ - e = AST_EventType::narrow_from_decl (i); - (void) s->fe_add_eventtype (e); + scope->fe_add_eventtype (eventtype); - // FE_EventHeader is not automatically destroyed in the AST - $2->destroy (); - delete $2; - $2 = 0; + // FE_OBVHeader is not automatically destroyed in the AST + event_header->destroy (); + delete event_header; + event_header = 0; sn.destroy (); } @@ -6426,7 +6498,9 @@ event_decl : /* * Push it on the scope stack. */ - idl_global->scopes ().push (e); + idl_global->scopes ().push (eventtype); + + $<dcval>$ = eventtype; } '{' { @@ -6445,7 +6519,7 @@ event_decl : */ idl_global->scopes ().pop (); - $$ = 0; + $$ = $<dcval>3; } ; @@ -6641,30 +6715,33 @@ porttype_decl { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeSeen); } - annotations_maybe IDENTIFIER + IDENTIFIER { + char *&id_value = $3; idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeIDSeen); - UTL_Scope *s = idl_global->scopes ().top_non_null (); - - Identifier id ($4); - ACE::strdelete ($4); - $4 = 0; + UTL_Scope *scope = idl_global->scopes ().top_non_null (); - UTL_ScopedName sn (&id, 0); - AST_PortType *p = - idl_global->gen ()->create_porttype (&sn); + Identifier id (id_value); + ACE::strdelete (id_value); + id_value = 0; - (void) s->fe_add_porttype (p); + UTL_ScopedName scoped_name (&id, 0); + AST_PortType *porttype = idl_global->gen ()->create_porttype ( + &scoped_name); + scope->fe_add_porttype (porttype); + $<dcval>$ = porttype; // Push it on the scopes stack. - idl_global->scopes ().push (p); - - delete $3; + idl_global->scopes ().push (porttype); } '{' { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeSqSeen); } + /** + * NOTE: IDL4.2 spec has a different definition of what can go inside a + * portype. + */ at_least_one_port_export { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeBodySeen); @@ -6676,44 +6753,44 @@ porttype_decl // Done with this port type - pop it off the scopes stack. idl_global->scopes ().pop (); - $$ = 0; + $$ = $<dcval>4; } ; at_least_one_port_export - : port_export port_exports + : port_exports at_least_one_annotation port_export { + AST_Annotation_Appls *&annotations = $2; + AST_Decl *&node = $3; + if (node) + { + node->annotation_appls (*annotations); + } + else + { + idl_global->err ()-> unsupported_warning ( + "Annotating this is not supported"); + } + delete annotations; } + | port_exports port_export ; port_exports - : port_exports port_export - { - } + : at_least_one_port_export | %empty - { - } ; port_export - : provides_decl - { - } - ';' - { - } - | uses_decl - { - } - ';' - { - } + : provides_decl ';' + | uses_decl ';' | attribute { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } ';' { + $$ = $1; } ; @@ -6744,21 +6821,17 @@ extended_port_decl } } + AST_Extended_Port *ep = 0; + if (so_far_so_good) { Identifier id ($3); ACE::strdelete ($3); $3 = 0; - UTL_ScopedName sn (&id, - 0); - - AST_Extended_Port *ep = - idl_global->gen ()->create_extended_port ( - &sn, - pt); - - (void) s->fe_add_extended_port (ep); + UTL_ScopedName sn (&id, 0); + ep = idl_global->gen ()->create_extended_port (&sn, pt); + s->fe_add_extended_port (ep); // Create (in the AST) the struct(s) and sequence(s) // needed for multiplex uses ports, if any. @@ -6786,6 +6859,8 @@ extended_port_decl $2->destroy (); delete $2; $2 = 0; + + $$ = ep; } | IDL_MIRRORPORT scoped_name IDENTIFIER { @@ -6813,26 +6888,24 @@ extended_port_decl } } + AST_Mirror_Port *mp = 0; + if (so_far_so_good) { Identifier id ($3); ACE::strdelete ($3); $3 = 0; - UTL_ScopedName sn (&id, - 0); - - AST_Mirror_Port *mp = - idl_global->gen ()->create_mirror_port ( - &sn, - pt); - - (void) s->fe_add_mirror_port (mp); + UTL_ScopedName sn (&id, 0); + mp = idl_global->gen ()->create_mirror_port (&sn, pt); + s->fe_add_mirror_port (mp); } $2->destroy (); delete $2; $2 = 0; + + $$ = mp; } ; diff --git a/TAO/TAO_IDL/fe/idl.yy.cpp b/TAO/TAO_IDL/fe/idl.yy.cpp index f537a2f11e3..bcb099c813a 100644 --- a/TAO/TAO_IDL/fe/idl.yy.cpp +++ b/TAO/TAO_IDL/fe/idl.yy.cpp @@ -3873,7 +3873,7 @@ idl_store_pragma (char *buf) static ACE_CDR::LongLong idl_atoi (char *s, long b) { - ACE_CDR::LongLong r = ACE_CDR_LONGLONG_INITIALIZER; + ACE_CDR::LongLong r = 0; // Skip over the dash and possibly spaces after the dash while (*s == '-' || *s == ' ' || *s == '\t') diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h index 2431423d4ef..d00dffdcbd8 100644 --- a/TAO/TAO_IDL/include/idl_global.h +++ b/TAO/TAO_IDL/include/idl_global.h @@ -691,6 +691,9 @@ public: void anon_type_diagnostic (ANON_TYPE_DIAGNOSTIC val); // Mutator for the member. + /// Has anon_type_diagnostic () been called? + bool explicit_anon_type_diagnostic () const; + bool anon_error (void) const; bool anon_warning (void) const; bool anon_silent (void) const; @@ -1067,6 +1070,7 @@ private: AST_Module *corba_module_; ANON_TYPE_DIAGNOSTIC anon_type_diagnostic_; + bool explicit_anon_type_diagnostic_; /// Flag set in parser so we can decide whether to emit /// an anonymous type diagnostic. diff --git a/TAO/TAO_IDL/include/utl_err.h b/TAO/TAO_IDL/include/utl_err.h index 0c217b35764..b80970dbe42 100644 --- a/TAO/TAO_IDL/include/utl_err.h +++ b/TAO/TAO_IDL/include/utl_err.h @@ -130,6 +130,7 @@ public: EIDL_KEYWORD_WARNING, // Same as above, but only a warning EIDL_ANONYMOUS_ERROR, // Anonymous types are deprecated by spec EIDL_ANONYMOUS_WARNING, // Same as above, but only a warning + EIDL_ANONYMOUS_EXPLICIT_ERROR, // Anonymous types have been explicitly disabled EIDL_ENUM_VAL_EXPECTED, // Expected an enumerator EIDL_ENUM_VAL_NOT_FOUND, // Didnt find an enumerator with that name EIDL_EVAL_ERROR, // Error in evaluating expression @@ -163,7 +164,9 @@ public: }; ErrorCode last_error; + long last_error_lineno; ErrorCode last_warning; + long last_warning_lineno; // Operations @@ -463,6 +466,9 @@ public: */ void annotation_param_missing_error ( AST_Annotation_Appl *appl, AST_Annotation_Member *member); + + /// Reset recent warning and error information + void reset_last_error_and_warning (); }; #endif // _UTL_ERR_UTL_ERR_HH diff --git a/TAO/TAO_IDL/tao_idl.cpp b/TAO/TAO_IDL/tao_idl.cpp index a21592d926c..c8d9811e690 100644 --- a/TAO/TAO_IDL/tao_idl.cpp +++ b/TAO/TAO_IDL/tao_idl.cpp @@ -232,7 +232,8 @@ DRV_drive (const char *s) // This option creates a single IDL file that includes all // input files. The backend outputs their names individually. - if (!idl_global->multi_file_input ()) + if (!idl_global->multi_file_input () && + (idl_global->compile_flags () & IDL_CF_INFORMATIVE)) { // Filename set by FE_yyparse(), so we output it immediately after. ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/TAO_IDL/util/utl_err.cpp b/TAO/TAO_IDL/util/utl_err.cpp index f29db6e97db..c9639fc9f6c 100644 --- a/TAO/TAO_IDL/util/utl_err.cpp +++ b/TAO/TAO_IDL/util/utl_err.cpp @@ -185,9 +185,12 @@ error_string (UTL_Error::ErrorCode c) case UTL_Error::EIDL_KEYWORD_WARNING: return "Warning - spelling differs from IDL keyword only in case: "; case UTL_Error::EIDL_ANONYMOUS_ERROR: - return "Error: anonymous types are deprecated by OMG spec"; + return "anonymous types require the IDL version to be 4 or later or must " + "be explictly enabled using -as"; case UTL_Error::EIDL_ANONYMOUS_WARNING: - return "Warning - anonymous types are deprecated by OMG spec"; + return "anonymous type found"; + case UTL_Error::EIDL_ANONYMOUS_EXPLICIT_ERROR: + return "anonymous types have been disabled"; case UTL_Error::EIDL_ENUM_VAL_EXPECTED: return "enumerator expected: "; case UTL_Error::EIDL_ENUM_VAL_NOT_FOUND: @@ -279,11 +282,13 @@ static void idl_error_header (UTL_Error::ErrorCode c, long lineno, ACE_CString s) { idl_global->err ()->last_error = c; + const long line_number = lineno == -1 ? idl_global->lineno () : lineno; + idl_global->err ()->last_error_lineno = line_number; ACE_ERROR ((LM_ERROR, "Error - %C: \"%C\", line %d: %C", idl_global->prog_name (), s.c_str (), - lineno == -1 ? idl_global->lineno () : lineno, + line_number, error_string (c))); idl_global->set_err_count (idl_global->err_count () + 1); } @@ -302,11 +307,13 @@ static void idl_warning_header (UTL_Error::ErrorCode c, long lineno, ACE_CString s) { idl_global->err ()->last_warning = c; + const long line_number = lineno == -1 ? idl_global->lineno () : lineno; + idl_global->err ()->last_warning_lineno = lineno; ACE_ERROR ((LM_WARNING, "Warning - %C: \"%C\", line %d: %C", idl_global->prog_name (), s.c_str (), - lineno == -1 ? idl_global->lineno () : lineno, + line_number, error_string (c))); } static void @@ -712,7 +719,9 @@ parse_state_to_error_message (IDL_GlobalData::ParseState ps) UTL_Error::UTL_Error () : last_error (EIDL_OK), - last_warning (EIDL_OK) + last_error_lineno (-1), + last_warning (EIDL_OK), + last_warning_lineno (-1) { } @@ -1504,7 +1513,7 @@ UTL_Error::scope_masking_error (AST_Decl *masked, void UTL_Error::anonymous_type_diagnostic (void) { - if (idl_global->anon_silent ()) + if (idl_global->anon_silent () || idl_global->in_typedef ()) { return; } @@ -1519,7 +1528,8 @@ UTL_Error::anonymous_type_diagnostic (void) } else { - idl_error_header (EIDL_ANONYMOUS_ERROR); + idl_error_header (idl_global->explicit_anon_type_diagnostic () ? + EIDL_ANONYMOUS_EXPLICIT_ERROR : EIDL_ANONYMOUS_ERROR); ACE_ERROR ((LM_ERROR, "\n")); } } @@ -1663,3 +1673,11 @@ UTL_Error::direct_warning ( ACE_ERROR ((LM_WARNING, ACE_TEXT ("%C\n"), reason)); } } + +void UTL_Error::reset_last_error_and_warning () +{ + last_error = EIDL_OK; + last_error_lineno = -1; + last_warning = EIDL_OK; + last_warning_lineno = -1; +} diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp index 2c60a64869b..686be6f0ff4 100644 --- a/TAO/TAO_IDL/util/utl_global.cpp +++ b/TAO/TAO_IDL/util/utl_global.cpp @@ -169,6 +169,7 @@ IDL_GlobalData::IDL_GlobalData (void) included_ami_receps_done_ (false), corba_module_ (0), anon_type_diagnostic_ (ANON_TYPE_ERROR), + explicit_anon_type_diagnostic_ (false), in_typedef_ (false), in_tmpl_mod_no_alias_ (false), in_tmpl_mod_alias_ (false) @@ -226,11 +227,11 @@ IDL_GlobalData::IDL_GlobalData (void) } #if defined (IDL_ANON_ERROR) - this->anon_type_diagnostic_ = ANON_TYPE_ERROR; + anon_type_diagnostic (ANON_TYPE_ERROR); #elif defined (IDL_ANON_WARNING) - this->anon_type_diagnostic_ = ANON_TYPE_WARNING; + anon_type_diagnostic (ANON_TYPE_WARNING); #elif defined (IDL_ANON_SILENT) - this->anon_type_diagnostic_ = ANON_TYPE_SILENT; + anon_type_diagnostic (ANON_TYPE_SILENT); #endif // ambiguous_type_seen_ and basic_type_seen_ are not reset between @@ -1838,25 +1839,41 @@ void IDL_GlobalData::anon_type_diagnostic ( IDL_GlobalData::ANON_TYPE_DIAGNOSTIC val) { - this->anon_type_diagnostic_ = val; + anon_type_diagnostic_ = val; + explicit_anon_type_diagnostic_ = true; +} + +bool +IDL_GlobalData::explicit_anon_type_diagnostic () const +{ + return explicit_anon_type_diagnostic_; } bool IDL_GlobalData::anon_error (void) const { - return (this->anon_type_diagnostic_ == ANON_TYPE_ERROR); + if (idl_version_ >= IDL_VERSION_4 && !explicit_anon_type_diagnostic_) { + return false; + } + return anon_type_diagnostic_ == ANON_TYPE_ERROR; } bool IDL_GlobalData::anon_warning (void) const { - return (this->anon_type_diagnostic_ == ANON_TYPE_WARNING); + if (idl_version_ >= IDL_VERSION_4 && !explicit_anon_type_diagnostic_) { + return false; + } + return anon_type_diagnostic_ == ANON_TYPE_WARNING; } bool IDL_GlobalData::anon_silent (void) const { - return (this->anon_type_diagnostic_ == ANON_TYPE_SILENT); + if (idl_version_ >= IDL_VERSION_4 && !explicit_anon_type_diagnostic_) { + return true; + } + return anon_type_diagnostic_ == ANON_TYPE_SILENT; } bool @@ -1930,64 +1947,83 @@ struct yy_buffer_state; extern yy_buffer_state *tao_yy_scan_string (const char *); extern int tao_yylex_destroy (); +namespace +{ + class OldState + { + public: + explicit OldState (bool disable_output = false) + : old_filename_ (idl_global->filename ()), + old_lineno_ (idl_global->lineno ()), + old_idl_src_file_ (idl_global->idl_src_file ()), + disable_output_ (disable_output), + default_streambuf_ (0), + flags_ (ACE_LOG_MSG->flags ()) + { + idl_global->in_eval_ = true; + + idl_global->set_lineno (1); + idl_global->set_filename (0); + + // Name this pseudo-file "builtin-N" + static char buffer[64]; + static unsigned n = 1; + ACE_OS::snprintf (&buffer[0], sizeof buffer, "builtin-%u", n++); + UTL_String utl_string (&buffer[0], true); + idl_global->idl_src_file (new UTL_String (&utl_string, true)); + idl_global->set_filename (new UTL_String (&utl_string, true)); + + if (disable_output_) + { + default_streambuf_ = ACE_DEFAULT_LOG_STREAM->rdbuf (); + ACE_DEFAULT_LOG_STREAM->rdbuf (0); + ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR); + ACE_LOG_MSG->clr_flags (ACE_LOG_MSG->flags ()); + } + } + + ~OldState() + { + idl_global->set_lineno (old_lineno_); + + idl_global->set_filename (old_filename_); + idl_global->idl_src_file ()->destroy (); + delete idl_global->idl_src_file (); + idl_global->idl_src_file (old_idl_src_file_); + idl_global->reset_flag_seen (); + + if (disable_output_) + { + ACE_DEFAULT_LOG_STREAM->rdbuf (default_streambuf_); + ACE_LOG_MSG->set_flags (flags_); + } + + tao_yylex_destroy (); + idl_global->in_eval_ = false; + } + + private: + UTL_String *old_filename_; + long old_lineno_; + UTL_String *old_idl_src_file_; + bool disable_output_; + std::streambuf *default_streambuf_; + const unsigned long flags_; + }; +} + void IDL_GlobalData::eval (const char *string, bool disable_output) { - in_eval_ = true; - - // Get IDL_Global Context - UTL_String *old_filename = filename (); - pd_filename = 0; - long old_lineno = lineno (); - idl_global->set_lineno (1); - UTL_String *old_idl_src_file = idl_src_file (); - - // Name this pseudo-file "builtin-N" -#define BUILTIN_NAME_BUFFER_SIZE 64 - static char buffer[BUILTIN_NAME_BUFFER_SIZE]; - static unsigned n = 1; - ACE_OS::snprintf (&buffer[0], BUILTIN_NAME_BUFFER_SIZE, "builtin-%u", n++); -#undef BUILTIN_NAME_BUFFER_SIZE - UTL_String utl_string (&buffer[0], true); - idl_global->idl_src_file (new UTL_String (&utl_string, true)); - idl_global->set_filename (new UTL_String (&utl_string, true)); + OldState old (disable_output); // Set up Flex to read from string tao_yy_scan_string (string); - // Disable Output - std::streambuf *default_streambuf = ACE_DEFAULT_LOG_STREAM->rdbuf (); - const unsigned long flags = ACE_LOG_MSG->flags (); - if (disable_output) - { - ACE_DEFAULT_LOG_STREAM->rdbuf (0); - ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR); - } - // emulate DRV_drive() FE_yyparse (); idl_global->check_primary_keys (); AST_check_fwd_decls (); - - // Renable Output - if (disable_output) - { - ACE_DEFAULT_LOG_STREAM->rdbuf (default_streambuf); - ACE_LOG_MSG->set_flags (flags); - } - - // Have Flex Cleanup - tao_yylex_destroy (); - - // Restore IDL_Global Context - idl_global->set_filename (old_filename); - idl_src_file()->destroy (); - delete idl_src_file (); - idl_src_file (old_idl_src_file); - idl_global->set_lineno (old_lineno); - idl_global->reset_flag_seen (); - - in_eval_ = false; } void diff --git a/TAO/VERSION.txt b/TAO/VERSION.txt index 50959b39a35..e5c30591118 100644 --- a/TAO/VERSION.txt +++ b/TAO/VERSION.txt @@ -1,4 +1,4 @@ -This is TAO version 2.5.8, released Mon Feb 10 09:28:37 CET 2020 +This is TAO version 2.5.9, released Fri May 01 09:57:51 CEST 2020 If you have any problems with or questions about TAO, please send e-mail to the TAO mailing list (tao-bugs@list.isis.vanderbilt.edu), diff --git a/TAO/docs/Security/Download.html b/TAO/docs/Security/Download.html index 7f8d06b475c..395cbdf364c 100644 --- a/TAO/docs/Security/Download.html +++ b/TAO/docs/Security/Download.html @@ -73,7 +73,7 @@ function MM_nbGroup(event, grpName) { //v3.0 by the BXA from this US site.</p> <h3>TAO CORBA Security Service Software</h3> <ul> - <li><a href="http://download.dre.vanderbilt.edu"> TAO: The ACE + <li><a href="https://download.dre.vanderbilt.edu"> TAO: The ACE ORB</a> (TAO's CORBA Security Service is now shipped with the main TAO distribution)</li> </ul> <h3>Cryptographic Software</h3> diff --git a/TAO/docs/ec_options.html b/TAO/docs/ec_options.html index 3b9430614b7..124dda5196b 100644 --- a/TAO/docs/ec_options.html +++ b/TAO/docs/ec_options.html @@ -558,7 +558,7 @@ static EC_QueueFullSimpleActions "[wait | discard]" the Event Channel will create the connection to the consumer at the moment the first event is pushed to the consumer. When the network is heavily loaded during this connect and a new event - is pushed before the connection is establed, a new create connection + is pushed before the connection is established, a new create connection request is done. When having very high connection establishment time (for example running on a WAN) and an interval that is much smaller than the connection establishment time it is wise to diff --git a/TAO/docs/tutorials/Quoter/index.html b/TAO/docs/tutorials/Quoter/index.html index e9c53e011d2..0371cf9f037 100644 --- a/TAO/docs/tutorials/Quoter/index.html +++ b/TAO/docs/tutorials/Quoter/index.html @@ -42,7 +42,7 @@ files for which links are provided. If you choose to build and run the example, however, use the files which are part of the TAO source you <A - HREF="http://download.dre.vanderbilt.edu">download</a>. You can + HREF="https://download.dre.vanderbilt.edu">download</a>. You can find those source files in <CODE>$TAO_ROOT/docs/tutorials/Quoter</CODE>, where there's also a Makefile to build them with. Downloading the files individually from these links may result in source that does not build diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/README b/TAO/examples/CSD_Strategy/ThreadPool5/README index 09860e64434..5fa0320b643 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/README +++ b/TAO/examples/CSD_Strategy/ThreadPool5/README @@ -1,5 +1,3 @@ - - Description: This test is a combination of other tests and has also added some @@ -44,4 +42,3 @@ $ ./run_test.pl cancel_servant OBJECT_NOT_EXIST or NO_IMPLEMENTATION exception after the servant is deactivated - this is what it is supposed to do - the exceptions are expected. - diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp index 09ab0ffc100..98d86ae8cd2 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp @@ -100,7 +100,7 @@ void Messenger_i::shutdown ( // CORBA::Octet *buf = x509_defining_authority.get_buffer(); - ACE_OS_String::memcpy( buf, x509, sizeof(x509)); + ACE_OS::memcpy( buf, x509, sizeof(x509)); // // Confirm the defining authority is "x509". // diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp index 17a151c12e2..77617b17086 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp @@ -57,13 +57,13 @@ TAO_EC_Thread_Flags::parse_symbols (const char* syms) return; static size_t num_flags = sizeof(supported_flags_)/sizeof(Supported_Flag); - char* s = ACE_OS_String::strdup (syms); // need a mutable string + char* s = ACE_OS::strdup (syms); // need a mutable string if (s == 0) return; const char* SEPARATORS = " |"; // this should probably be at class level char* ptr = 0; - char* tok = ACE_OS_String::strtok_r (s, SEPARATORS, &ptr); + char* tok = ACE_OS::strtok_r (s, SEPARATORS, &ptr); while (tok != 0) { // This would allow for easy accomodation of flags that @@ -76,14 +76,14 @@ TAO_EC_Thread_Flags::parse_symbols (const char* syms) // If somebody specifies the scheduler this way, then they // lose range checking on the priority. Bummer, but those // are the breaks. - this->flags_ |= ACE_OS_String::strtol (tok, 0, 0); + this->flags_ |= ACE_OS::strtol (tok, 0, 0); } else { int found = 0; for (size_t i = 0; !found && i < num_flags; ++i) { - if (ACE_OS_String::strcasecmp (tok, supported_flags_[i].n) == 0) + if (ACE_OS::strcasecmp (tok, supported_flags_[i].n) == 0) { this->flags_ |= supported_flags_[i].v; @@ -114,7 +114,7 @@ TAO_EC_Thread_Flags::parse_symbols (const char* syms) tok)); } } - tok = ACE_OS_String::strtok_r (0, SEPARATORS, &ptr); + tok = ACE_OS::strtok_r (0, SEPARATORS, &ptr); } ACE_OS::free (s); // clean up after ourselves diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp index 2db58389364..dda812b88b0 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp @@ -194,17 +194,17 @@ namespace TAO // If it is COMPLETED_MAYBE, then we will throw a COMPLETED_NO, // which the ORB should understand - if (ACE_OS_String::strcmp (rep_id.in (), + if (ACE_OS::strcmp (rep_id.in (), "IDL:omg.org/CORBA/TRANSIENT:1.0") == 0) throw CORBA::TRANSIENT (min, CORBA::COMPLETED_NO); - else if (ACE_OS_String::strcmp (rep_id.in (), + else if (ACE_OS::strcmp (rep_id.in (), "IDL:omg.org/CORBA/COMM_FAILURE:1.0") == 0) throw CORBA::COMM_FAILURE (min, CORBA::COMPLETED_NO); - else if (ACE_OS_String::strcmp (rep_id.in (), + else if (ACE_OS::strcmp (rep_id.in (), "IDL:omg.org/CORBA/NO_REPONSE:1.0") == 0) throw CORBA::NO_RESPONSE (min, CORBA::COMPLETED_NO); - else if (ACE_OS_String::strcmp (rep_id.in (), + else if (ACE_OS::strcmp (rep_id.in (), "IDL:omg.org/CORBA/OBJ_ADAPTER:1.0") == 0) throw CORBA::OBJ_ADAPTER (min, CORBA::COMPLETED_NO); cout << "Didnt throw exception " << endl; diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h index ce4dcfa6b34..057d7ebe609 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h @@ -45,7 +45,6 @@ namespace TAO * are known so the stream may be handed off to either an existing * session, or to a newly created one. */ - typedef TAO_Creation_Strategy<Connection_Handler> CREATION_STRATEGY2; typedef TAO_Concurrency_Strategy<Connection_Handler> CONCURRENCY_STRATEGY2; diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h index 79525e3729e..f453b5cf8fa 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h @@ -82,9 +82,9 @@ TAO_END_VERSIONED_NAMESPACE_DECL // Note that these declarations are placed outside of the scope of the // namespace. The generated functions use a C style signature which does -// not accomodate namespaces, so assuming namespace concatination is an +// not accommodate namespaces, so assuming namespace concatenation is an // error. The service class name should be composed of a flattened class -// name, with the namespaces preceeding the class name with '_'. +// name, with the namespaces preceding the class name with '_'. ACE_STATIC_SVC_DECLARE_EXPORT (HTIOP, TAO_HTIOP_Protocol_Factory) ACE_FACTORY_DECLARE (HTIOP, TAO_HTIOP_Protocol_Factory) diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/README.txt b/TAO/orbsvcs/orbsvcs/HTIOP/README.txt index d4d1e86052e..798ed1d3ba6 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/README.txt +++ b/TAO/orbsvcs/orbsvcs/HTIOP/README.txt @@ -1,5 +1,3 @@ - - HTTP Tunneling Inter-ORB Protocol Introduction @@ -9,8 +7,6 @@ HTTP Tunneling Inter-ORB Protocol Introduction - - 1.Terminology Inside - This refers to any peer that is inside a firewall protected diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp index 0141e56b96c..c5c6d1097c4 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp @@ -340,7 +340,7 @@ TAO_Port_Utils<T>::create_entry (const char *id, return T::_narrow (obj.in ()); } -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x730) +#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) // Borland gives warnings about argument not used on the construct as used // for the other compilers. This has been reported to Borland, adding // a workaround to suppress these warnings so that the real important ones diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h index 002d0cc6d86..67021c98ab8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h @@ -21,7 +21,7 @@ #if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1) -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x730) +#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) # pragma option push -w-8022 #endif @@ -68,7 +68,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x730) +#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) # pragma option pop #endif diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h index 2458f1e7e22..d8e61bda16b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h @@ -18,7 +18,7 @@ #include "orbsvcs/Notify/Default_Factory.h" -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x730) +#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) # pragma option push -w-8022 #endif @@ -50,7 +50,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x730) +#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) # pragma option pop #endif diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.cpp index d55cdd28519..114eae51119 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.cpp @@ -220,11 +220,11 @@ TAO::PG_Group_List_Store::read (TAO::Storable_Base & stream) stream >> this->next_group_id_; - size_t size; + ACE_UINT64 size; stream >> size; PortableGroup::ObjectGroupId group_id; - for (size_t i = 0; i < size; ++i) + for (ACE_UINT64 i = 0; i < size; ++i) { stream >> group_id; group_ids_.insert (group_id); @@ -237,7 +237,7 @@ TAO::PG_Group_List_Store::write (TAO::Storable_Base & stream) stream.rewind (); stream << this->next_group_id_; - stream << group_ids_.size (); + stream << static_cast<ACE_UINT64> (group_ids_.size ()); for (Group_Id_Const_Iterator it = group_ids_.begin (); it != group_ids_.end (); ++it) { @@ -259,7 +259,7 @@ TAO::PG_Group_List_Store::create_stream (const char * mode) bool TAO::PG_Group_List_Store::list_obsolete () { - // TODO: Upate if obsolete flag is set based on CORBA call. + // TODO: Update if obsolete flag is set based on CORBA call. ACE_Auto_Ptr<TAO::Storable_Base> stream (this->create_stream ("r")); if (!stream->exists ()) throw CORBA::INTERNAL (); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.h index 0f2c2cbc9f5..6a0d967e248 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.h @@ -87,7 +87,6 @@ namespace TAO bool list_obsolete (); private: - Group_Ids group_ids_; /// Ensure ID is monotonically increasing even when groups gets @@ -110,7 +109,6 @@ namespace TAO TAO_SYNCH_MUTEX lock_; friend class PG_Group_List_Store_File_Guard; - }; } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp index 566182384dd..e27cc9adfbb 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp @@ -602,7 +602,7 @@ TAO::PG_Object_Group_Storable::write (TAO::Storable_Base & stream) ///// members_ ///// size_t const num_members = this->members_.current_size (); - stream << num_members; + stream << static_cast<ACE_UINT64> (num_members); for (MemberMap_Iterator it = this->members_.begin (); it != this->members_.end (); ++it) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.h index bcf96d01b49..5a2236c3e1d 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.h @@ -43,7 +43,7 @@ namespace TAO_PG */ class TAO_PortableGroup_Export TAO_UIPMC_Mcast_Transport : public TAO_Transport { - // This is neccessary on some old compilers such as Studio 9 for SunOS + // This is necessary on some old compilers such as Studio 9 for SunOS // to let UIPMC_Recv_Packet_Cleanup_Guard access private cleanup_packets(). friend class TAO_PG::UIPMC_Recv_Packet_Cleanup_Guard; @@ -115,7 +115,7 @@ private: bool &stop_packet, u_long &id_hash) const; - /// Return the next complete MIOP packet, possiably dequeueing + /// Return the next complete MIOP packet, possibly dequeueing /// as many as are available first from the socket. TAO_PG::UIPMC_Recv_Packet *recv_all (TAO_Resume_Handle &rh); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h index 5c53112a86f..7a7e5de736d 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h @@ -28,7 +28,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - /** * @class IIOP_SSL_Acceptor * @@ -43,7 +42,6 @@ namespace TAO class IIOP_SSL_Acceptor : public TAO_IIOP_Acceptor { public: - typedef ACE_Strategy_Acceptor<IIOP_SSL_Connection_Handler, ACE_SOCK_ACCEPTOR> TAO_IIOP_SSL_BASE_ACCEPTOR; typedef TAO_Creation_Strategy<IIOP_SSL_Connection_Handler> TAO_IIOP_SSL_CREATION_STRATEGY; typedef TAO_Concurrency_Strategy<IIOP_SSL_Connection_Handler> TAO_IIOP_SSL_CONCURRENCY_STRATEGY; @@ -58,7 +56,6 @@ namespace TAO virtual int close (void); private: - /// The concrete acceptor, as a pointer to it's base class. TAO_IIOP_SSL_BASE_ACCEPTOR base_acceptor_; @@ -72,9 +69,7 @@ namespace TAO TAO_IIOP_SSL_CONCURRENCY_STRATEGY *concurrency_strategy_; TAO_IIOP_SSL_ACCEPT_STRATEGY *accept_strategy_; //@} - }; - } // End TAO namespace. TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp index 932159fd9ed..4622a9ac7a8 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp @@ -23,7 +23,8 @@ static const char * const TAO_IIOP_SSL_Connect_Timeprobe_Description[] = "IIOP_SSL_Connection_Handler::receive_request - end", "IIOP_SSL_Connection_Handler::send_request - start", - "IIOP_SSL_Connection_Handler::send_request - end"}; + "IIOP_SSL_Connection_Handler::send_request - end" +}; enum { @@ -35,7 +36,6 @@ enum TAO_IIOP_SSL_CONNECTION_HANDLER_HANDLE_LOCATE_END, TAO_IIOP_SSL_CONNECTION_HANDLER_RECEIVE_REQUEST_END - }; // Setup Timeprobes @@ -58,7 +58,6 @@ TAO::IIOP_SSL_Connection_Handler::IIOP_SSL_Connection_Handler ( ACE_ASSERT (0); } - TAO::IIOP_SSL_Connection_Handler::IIOP_SSL_Connection_Handler ( TAO_ORB_Core *orb_core) : TAO_IIOP_Connection_Handler (orb_core) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h index 7d5f1752a8d..1a31541d446 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h @@ -71,12 +71,9 @@ namespace TAO ACE_Time_Value *max_wait_time = 0); protected: - /// Reference to the TAO::SSLIOP::Current object. TAO::SSLIOP::Current_var current_; - }; - } // End TAO namespace. TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h index d1a43e114a0..996dc779302 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h @@ -65,7 +65,6 @@ namespace TAO ACE_SSL_SOCK_Acceptor> { public: - /// Constructor. Accept_Strategy (TAO_ORB_Core * orb_core, const ACE_Time_Value & timeout, @@ -76,7 +75,6 @@ namespace TAO virtual int accept_svc_handler (handler_type * svc_handler); private: - /// The accept() timeout. /** * This timeout includes the overall time to complete the SSL @@ -84,9 +82,8 @@ namespace TAO * handshake. */ const ACE_Time_Value timeout_; - bool check_host_; + bool const check_host_; }; - } // End SSLIOP namespace } // End TAO namespace diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h index f193f4090ee..bff291674b7 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h @@ -36,7 +36,6 @@ namespace TAO { namespace SSLIOP { - /** * @class Acceptor * @@ -46,7 +45,6 @@ namespace TAO : public IIOP_SSL_Acceptor { public: - /// Constructor. Acceptor (::Security::QOP qop, const ACE_Time_Value & timeout, @@ -89,7 +87,6 @@ namespace TAO const ::SSLIOP::SSL &ssl_component (void) const; private: - /// Implement the common part of the open*() methods. int ssliop_open_i (TAO_ORB_Core *orb_core, const ACE_INET_Addr& addr, @@ -117,7 +114,6 @@ namespace TAO CORBA::Short priority); private: - /// The concrete acceptor, as a pointer to it's base class. BASE_ACCEPTOR ssl_acceptor_; @@ -152,9 +148,7 @@ namespace TAO ACE_Time_Value const timeout_; bool check_host_; - }; - } // End SSLIOP namespace. } // End TAO namespace. diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h index 0cf69379576..73fce84efc9 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h @@ -32,7 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO @@ -41,17 +40,12 @@ namespace TAO { /** * @class ClientCredentials - * - * @brief - * - * */ class ClientCredentials : public virtual SecurityLevel3::ClientCredentials, public virtual SSLIOP_Credentials { public: - /// Constructor ClientCredentials (::X509 * cert, ::EVP_PKEY * evp, ::SSL * ssl); @@ -98,7 +92,6 @@ namespace TAO //@} protected: - /// Destructor /** * Protected destructor to enforce proper memory management @@ -107,13 +100,10 @@ namespace TAO ~ClientCredentials (void); private: - /// Reference to the OpenSSL @c SSL data structure associated /// with the current security context (e.g. SSL connection). TAO::SSLIOP::SSL_var ssl_; - }; - } // End SSLIOP namespace } // End TAO namespace diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h index 59ab1a9ff8c..5838e7579f7 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h @@ -37,7 +37,6 @@ namespace TAO { namespace SSLIOP { - /** * @class Connection_Handler * @@ -51,7 +50,6 @@ namespace TAO public TAO_Connection_Handler { public: - Connection_Handler (ACE_Thread_Manager* t = 0); /// Constructor. @@ -108,7 +106,6 @@ namespace TAO bool check_host (void); protected: - //@{ /** * @name TAO_Connection Handler overloads @@ -119,11 +116,9 @@ namespace TAO //@} protected: - /// Reference to the SSLIOP::Current object (downcast to gain /// access to the low-level management methods). TAO::SSLIOP::Current_var current_; - }; // **************************************************************** @@ -146,7 +141,6 @@ namespace TAO class State_Guard { public: - /// Constructor that sets up the TSS SSL state. State_Guard (TAO::SSLIOP::Connection_Handler *handler, int &result); @@ -155,7 +149,6 @@ namespace TAO ~State_Guard (void); private: - /// Pointer to the connection handler currently handling the /// request/upcall. Connection_Handler *handler_; diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h index 67f8eadd7fc..c553948bbfb 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h @@ -53,7 +53,6 @@ namespace TAO class Connector : public TAO::IIOP_SSL_Connector { public: - /// Constructor. Connector (::Security::QOP qop, bool check_host); @@ -75,7 +74,6 @@ namespace TAO //@} protected: - /** * @name @c TAO_Connector Methods * @@ -114,7 +112,6 @@ namespace TAO SSL *ssl); public: - typedef TAO_Connect_Concurrency_Strategy<Connection_Handler> CONNECT_CONCURRENCY_STRATEGY; @@ -130,7 +127,6 @@ namespace TAO BASE_CONNECTOR; private: - /// If zero, connect to IIOP over SSL port by default. /// Otherwise, connect to the insecure IIOP port. ::Security::QOP qop_; @@ -144,9 +140,7 @@ namespace TAO /// The connector initiating connection requests for IIOP. BASE_CONNECTOR base_connector_; - }; - } // End SSLIOP namespace. } // End TAO namespace. diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h index 8ea7ad699df..8e38967aa94 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h @@ -31,12 +31,12 @@ namespace TAO { class SSLIOP_Credentials; - namespace SSLIOP - { - typedef SSLIOP_Credentials* Credentials_ptr; - typedef TAO_Pseudo_Var_T<SSLIOP_Credentials> Credentials_var; - typedef TAO_Pseudo_Out_T<SSLIOP_Credentials> Credentials_out; - } + namespace SSLIOP + { + typedef SSLIOP_Credentials* Credentials_ptr; + typedef TAO_Pseudo_Var_T<SSLIOP_Credentials> Credentials_var; + typedef TAO_Pseudo_Out_T<SSLIOP_Credentials> Credentials_out; + } /** * @class SSLIOP_Credentials @@ -125,7 +125,6 @@ namespace TAO //@} protected: - /// Destructor. /** * Protected destructor to enforce proper memory management @@ -134,7 +133,6 @@ namespace TAO ~SSLIOP_Credentials (void); protected: - /// Reference to the X.509 certificate associated with this SSLIOP /// Credentials object. SSLIOP::X509_var x509_; @@ -154,10 +152,7 @@ namespace TAO /// The validity of the Credentials. SecurityLevel3::CredentialsState creds_state_; - }; - -// } // End SSLIOP namespace } // End TAO namespace TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp index 23fb3ea2a71..0528fe63f03 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp @@ -20,7 +20,6 @@ # define TAO_SSLIOP_PASSWORD_CALLBACK_NAME TAO_SSLIOP_password_callback #endif /* TAO_HAS_VERSIONED_NAMESPACE == 1 */ - extern "C" int TAO_SSLIOP_PASSWORD_CALLBACK_NAME (char *buf, @@ -31,7 +30,6 @@ TAO_SSLIOP_PASSWORD_CALLBACK_NAME (char *buf, // @@ I'm probably over complicating this implementation, but that's // what you get when you try to be overly efficient. :-) // -Ossama - const char * password = static_cast<char *> (userdata); int pwlen = -1; diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h index 1e6e1e05029..c0e216cc120 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h @@ -28,13 +28,11 @@ #include <openssl/opensslconf.h> - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ - /// Forward declarations for OpenSSL data structures. extern "C" { @@ -61,7 +59,6 @@ namespace TAO public virtual ::CORBA::LocalObject { public: - /// Constructor CredentialsAcquirer (TAO::SL3::CredentialsCurator_ptr curator, const CORBA::Any & acquisition_arguments); @@ -91,7 +88,6 @@ namespace TAO //@} protected: - /// Destructor /** * Protected destructor to enforce proper memory management @@ -100,7 +96,6 @@ namespace TAO ~CredentialsAcquirer (void); private: - /// Verify that this CredentialsAcquirer object is still valid, /// i.e. hasn't been destroyed. void check_validity (void); @@ -112,7 +107,6 @@ namespace TAO static ::EVP_PKEY * make_EVP_PKEY (const ::SSLIOP::File &key); private: - /// Lock used for synchronization. TAO_SYNCH_MUTEX lock_; @@ -125,9 +119,7 @@ namespace TAO /// Has this CredentialsAcquirer object completed credentials /// acquisition or been explicitly destroyed? bool destroyed_; - }; - } // End SSLIOP namespace } // End TAO namespace diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h index f1a7e01e766..912e55a26ab 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h @@ -31,7 +31,6 @@ namespace TAO { namespace SSLIOP { - /** * @class CredentialsAcquirerFactory * @@ -44,14 +43,11 @@ namespace TAO : public virtual TAO::SL3::CredentialsAcquirerFactory { public: - /// Create a TAO::SSLIOP::CredentialsAcquirerFactory. virtual SecurityLevel3::CredentialsAcquirer_ptr make ( TAO::SL3::CredentialsCurator_ptr curator, const CORBA::Any & acquisition_arguments); - }; - } // End SSLIOP namespace } // End TAO namespace diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h index 0ab11669387..403d68751a1 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h @@ -120,7 +120,6 @@ namespace TAO //@} protected: - /// Destructor ~Current (void); @@ -131,7 +130,6 @@ namespace TAO Current_Impl *implementation (void); private: - /// Prevent copying through the copy constructor and the assignment /// operator. //@{ @@ -140,7 +138,6 @@ namespace TAO //@} private: - /// TSS slot assigned to this object. size_t tss_slot_; diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h index 04a7a556cf3..1b3a69de58a 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h @@ -43,7 +43,6 @@ namespace TAO class Current_Impl : public TAO::SL3::SecurityCurrent_Impl { public: - /// Constructor. Current_Impl (void); @@ -74,12 +73,10 @@ namespace TAO SSL *ssl (void); protected: - /// Return the unique tag that identifies the concrete subclass. virtual CORBA::ULong tag (void) const; private: - /// Prevent copying through the copy constructor and the assignment /// operator. //@{ @@ -88,10 +85,8 @@ namespace TAO //@} private: - /// The SSL session state corresponding to the current upcall. SSL *ssl_; - }; } // End SSLIOP namespace. } // End TAO namespace. diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h index e3bba37c5c1..df49439989d 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h @@ -53,7 +53,6 @@ namespace TAO class TAO_SSLIOP_Export TAO_SSLIOP_Endpoint : public TAO_Endpoint { public: - friend class TAO_SSLIOP_Profile; /// Constructor @@ -159,13 +158,11 @@ namespace TAO int credentials_set (void) const; protected: - /// Cache the SSL tagged component in a decoded format. Notice /// that we do not need to marshal this object! ::SSLIOP::SSL ssl_component_; private: - /// Cached instance of ACE_INET_Addr for use in making invocations, /// etc. mutable ACE_INET_Addr object_addr_; @@ -222,7 +219,6 @@ namespace TAO class TAO_SSLIOP_Export TAO_SSLIOP_Synthetic_Endpoint : public TAO_SSLIOP_Endpoint { public: - /// Constructor TAO_SSLIOP_Synthetic_Endpoint (TAO_IIOP_Endpoint *iiop_endp); @@ -246,7 +242,6 @@ namespace TAO TAO_SSLIOP_Synthetic_Endpoint (const ::SSLIOP::SSL *ssl); }; - // } // End SSLIOP namespace. // } // End TAO namespace. diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp index 6cea0ee37ed..907e7246983 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp @@ -336,7 +336,7 @@ TAO::SSLIOP::Protocol_Factory::init (int argc, ACE_TCHAR* argv[]) ? SSL_MAX_SSL_SESSION_ID_LENGTH : sizeof session_id_context_; - // Note that this function returns 1, if the operation succeded. + // Note that this function returns 1, if the operation succeeded. // See SSL_CTX_set_session_id_context(3) if( 1 != ::SSL_CTX_set_session_id_context (ssl_ctx->context(), session_id_context_, diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h index 5e76d3244b8..12617d2179c 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h @@ -58,7 +58,6 @@ namespace TAO public virtual ::CORBA::LocalObject { public: - /*! \brief Constructor. \param info reference to the ORBInitInfo object so that @@ -100,7 +99,6 @@ namespace TAO //@} protected: - /// Destructor /** * Protected destructor to force deallocation by the reference @@ -109,7 +107,6 @@ namespace TAO ~Server_Invocation_Interceptor (void); private: - /** * @name Copying and Assignment * @@ -122,7 +119,6 @@ namespace TAO //@} private: - /// Reference to the current SSLIOP execution context. ::SSLIOP::Current_var ssliop_current_; @@ -139,7 +135,6 @@ namespace TAO SecurityLevel2::SecurityManager_var sec2manager_; SecurityLevel2::Current_var sec2_current_; }; - } // End SSLIOP namespace. } // End TAO namespace. diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h index 074ab7dd4ed..c5d932c13d3 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h @@ -39,7 +39,6 @@ namespace TAO { namespace SSLIOP { - /** * @name ORBInitializer * @@ -52,7 +51,6 @@ namespace TAO public virtual ::CORBA::LocalObject { public: - /// Constructor. ORBInitializer (::Security::QOP qop); @@ -61,16 +59,13 @@ namespace TAO virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: - // Obtain the TSS slot ID assigned to the "SSLIOPCurrent" object. size_t get_tss_slot_id (PortableInterceptor::ORBInitInfo_ptr info); private: - /// The default quality-of-protection settings in use. ::Security::QOP qop_; }; - } // End SSLIOP namespace. } // End TAO namespace. diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h index 25616b74df5..4b180f5f005 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h @@ -88,7 +88,6 @@ namespace TAO //@} protected: - /// Destructor /** * Protected destructor to enforce proper memory management @@ -96,7 +95,6 @@ namespace TAO */ ~OwnCredentials (void); }; - } // End SSLIOP namespace } // End TAO namespace diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h index 2b45409887c..92e01b78220 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h @@ -105,7 +105,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL void remove_generic_endpoint (TAO_Endpoint *ep); protected: - /// Destructor. /** * Protected destructor to enforce proper memory management @@ -121,7 +120,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL const TAO_Profile * other_profile); private: - /** * Helper for @c decode. Decodes TAO_TAG_SSL_ENDPOINTS from a * tagged component. Decode only if RTCORBA is enabled. @@ -171,7 +169,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * attributes - port number, for instance. */ int ssl_only_; - }; // } // End SSLIOP namespace. diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h index 8f1494b00a9..b67de885b0c 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h @@ -41,7 +41,6 @@ namespace TAO public virtual SSLIOP_Credentials { public: - TargetCredentials (::X509 *cert, ::EVP_PKEY *evp); /** @@ -91,7 +90,6 @@ namespace TAO virtual void release (void); //@} - }; } } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h index 92bcc0963b6..05fd173c5cd 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h @@ -33,7 +33,6 @@ #include "ace/Svc_Handler.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Forward decls. @@ -59,7 +58,6 @@ namespace TAO class TAO_SSLIOP_Export Transport : public TAO_Transport { public: - /// Constructor. Transport (Connection_Handler *handler, TAO_ORB_Core *orb_core); @@ -110,12 +108,11 @@ namespace TAO TAO_Message_Semantics (), ACE_Time_Value *max_time_wait = 0); - /// Open teh service context list and process it. + /// Open the service context list and process it. virtual int tear_listen_point_list (TAO_InputCDR &cdr); //@} private: - /// Set the Bidirectional context info in the service context /// list. void set_bidir_context_info (TAO_Operation_Details &opdetails); @@ -127,12 +124,10 @@ namespace TAO TAO_Acceptor *acceptor); private: - /// The connection service handler used for accessing lower layer /// communication protocols. Connection_Handler *connection_handler_; }; - } // End SSLIOP namespace. } // End TAO namespace. diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h index 4fe185785bb..e4b5e931552 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h @@ -24,7 +24,6 @@ #include "orbsvcs/SSLIOP/SSLIOP_Current.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_ORB_Core; @@ -41,16 +40,14 @@ namespace TAO * classes in the SSLIOP pluggable protocol. * * Methods useful to many classes in the SSLIOP pluggable protocol - * are centrally located in this uility class. + * are centrally located in this utility class. */ class Util { public: /// Access Current. static TAO::SSLIOP::Current_ptr current (TAO_ORB_Core *orb_core); - }; - } // End SSLIOP namespace. } // End TAO namespace. diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp index e6d431f20fa..0dfb18dcc59 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp @@ -105,7 +105,7 @@ TAO::Security::AccessDecision::ReferenceKeyType::operator== other.oid_->get_buffer(),olen) == 0 && ACE_OS::memcmp (this->adapter_id_->get_buffer(), other.adapter_id_->get_buffer(),alen) == 0 && - ACE_OS_String::strcmp (this->orbid_.in(), other.orbid_.in()) == 0); + ACE_OS::strcmp (this->orbid_.in(), other.orbid_.in()) == 0); return false; } diff --git a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp index e9f076139da..7a6b5749447 100644 --- a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp @@ -42,16 +42,10 @@ Service_Shutdown::set_signals (ACE_Sig_Set& which_signals) { if (this->shutdown_.register_handler (i, this) == -1) { -#if defined(__TANDEM) -// Tandem NSK platform has no signal 10 so do not emit a warning for it - if (i != 10) -#endif - { - ORBSVCS_DEBUG ((LM_WARNING, - "WARNING: Failed to register signal handler " - "for signal %d: %p\n", - i, ACE_TEXT ("register_handler"))); - } + ORBSVCS_DEBUG ((LM_WARNING, + "WARNING: Failed to register signal handler " + "for signal %d: %p\n", + i, ACE_TEXT ("register_handler"))); } else { diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h index f76dc516a63..2a7f45e1a0f 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef TAO_TIME_SERVICE_CLERK_H #define TAO_TIME_SERVICE_CLERK_H #include /**/ "ace/pre.h" @@ -21,7 +20,6 @@ #include "orbsvcs/Time/Timer_Helper.h" #include "orbsvcs/Time/time_serv_export.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** @@ -39,7 +37,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Time_Serv_Export TAO_Time_Service_Clerk : public POA_CosTime::TimeService { public: - /// Helper class to help in the updation of time. friend class Timer_Helper; @@ -97,7 +94,6 @@ public: CORBA::ULongLong time_; private: - /// Time displacement factor in minutes. CORBA::Short time_displacement_factor_; diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h index e03dc3fd380..2a7b5a0fc05 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h @@ -34,7 +34,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL */ class TAO_Time_Serv_Export TAO_Time_Service_Server : public POA_CosTime::TimeService { - public: /// Constructor. TAO_Time_Service_Server (void); @@ -64,7 +63,6 @@ public: /// This creates a new TIO with the given parameters. virtual CosTime::TIO_ptr new_interval (TimeBase::TimeT lower, TimeBase::TimeT upper); - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp index d3fb66a6287..11461266cf6 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp @@ -8,7 +8,6 @@ TAO_UTO::TAO_UTO (TimeBase::TimeT time, TimeBase::InaccuracyT inaccuracy, TimeBase::TdfT tdf) { - this->attr_utc_time_.time = time; // Extract the lower 32 bits in the inacclo. @@ -17,16 +16,10 @@ TAO_UTO::TAO_UTO (TimeBase::TimeT time, // Extract the lower 16 bits of the remaining bits. 'And'ing with 0xFFFF // is only a sanity check. -#if defined (ACE_LACKS_U_LONGLONG_T) - this->attr_utc_time_.inacchi = 0; -#else this->attr_utc_time_.inacchi = static_cast<CORBA::UShort> ((inaccuracy >> 32U) & 0xFFFF); -#endif /* ACE_LACKS_U_LONGLONG_T */ - this->attr_utc_time_.tdf = tdf; - } // Destructor. diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h index b971ae8b7a1..68dbfe5f082 100644 --- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h +++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h @@ -20,7 +20,6 @@ #include /**/ "ace/pre.h" - #include "ace/Event_Handler.h" #include "ace/Containers.h" #include "orbsvcs/Time/time_serv_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h index 56d05fd59e5..521827604cc 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h @@ -8,7 +8,6 @@ */ //============================================================================= - #ifndef TAO_CONSTRAINT_INTERPRETER_H #define TAO_CONSTRAINT_INTERPRETER_H #include /**/ "ace/pre.h" @@ -49,7 +48,7 @@ public: /** * This constructor builds an expression tree representing the - * constraint specified in <constraints>, and throws an Illegal + * constraint specified in @a constraints, and throws an Illegal * Constraint exception if the constraint given has syntax errors or * semantic errors, such as mismatched types. */ @@ -135,7 +134,6 @@ public: typedef ACE_Unbounded_Queue<Preference_Info> Ordered_Offers; private: - /// Disallow copying. TAO_Preference_Interpreter (const TAO_Preference_Interpreter&); TAO_Preference_Interpreter& operator= (const TAO_Preference_Interpreter&); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h index 108b6e76a7f..3f03064bb22 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h @@ -52,7 +52,6 @@ namespace CORBA class TAO_Trading_Serv_Export TAO_Constraint { public: - /** * Implementing the pattern of double dispatching, each subclass of * TAO_Constraint will call back on an InterpreterVisitor the @@ -74,7 +73,6 @@ public: class TAO_Trading_Serv_Export TAO_Noop_Constraint : public TAO_Constraint { public: - TAO_Noop_Constraint (TAO_Expression_Type type) : type_ (type) {} @@ -84,7 +82,6 @@ public: { return this->type_; } private: - TAO_Expression_Type type_; }; @@ -97,7 +94,6 @@ private: class TAO_Trading_Serv_Export TAO_Binary_Constraint : public TAO_Constraint { public: - TAO_Binary_Constraint (TAO_Expression_Type op_type, TAO_Constraint* left, TAO_Constraint* right); @@ -135,7 +131,6 @@ public: static int visit_in (TAO_Constraint_Visitor* , TAO_Binary_Constraint*); private: - TAO_Binary_Constraint (const TAO_Binary_Constraint&); TAO_Binary_Constraint& operator= (const TAO_Binary_Constraint&); @@ -156,9 +151,8 @@ private: class TAO_Trading_Serv_Export TAO_Unary_Constraint : public TAO_Constraint { public: - TAO_Unary_Constraint (TAO_Expression_Type op_type, - TAO_Constraint* operand); + TAO_Constraint* operand); virtual ~TAO_Unary_Constraint (void); @@ -170,7 +164,6 @@ public: TAO_Constraint* operand (void); private: - TAO_Unary_Constraint (const TAO_Unary_Constraint&); TAO_Unary_Constraint& operator= (const TAO_Unary_Constraint&); @@ -190,7 +183,6 @@ private: class TAO_Trading_Serv_Export TAO_Property_Constraint : public TAO_Constraint { public: - TAO_Property_Constraint (const char* name); virtual ~TAO_Property_Constraint (void); @@ -203,7 +195,6 @@ public: const char* name (void) const; private: - TAO_Property_Constraint (const TAO_Property_Constraint&); TAO_Property_Constraint& operator= (const TAO_Property_Constraint&); @@ -219,8 +210,7 @@ private: */ class TAO_Trading_Serv_Export TAO_Literal_Constraint : public TAO_Constraint { - public: - +public: TAO_Literal_Constraint (void); // = Constructors for each of the various types of literals. @@ -339,7 +329,6 @@ class TAO_Trading_Serv_Export TAO_Literal_Constraint : public TAO_Constraint /// The actual types of the TAO_Literal_Constraint. TAO_Expression_Type type_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h index f3977b64be7..7ce4a6227e7 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h @@ -2,6 +2,9 @@ #define CONSTRAINT_TOKENS_H #include /**/ "ace/pre.h" +#ifndef _yy_defines_h_ +#define _yy_defines_h_ + #define TAO_GT 257 #define TAO_GE 258 #define TAO_LT 259 @@ -36,5 +39,7 @@ #define TAO_MIN 288 #define TAO_FIRST 289 #define TAO_RANDOM 290 + +#endif /* _yy_defines_h_ */ #include /**/ "ace/post.h" #endif /* CONSTRAINT_TOKENS_H */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp index 282aa57e8d2..d44d126c578 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp @@ -5,7 +5,7 @@ #define YYBYACC 1 #define YYMAJOR 1 #define YYMINOR 9 -#define YYPATCH 20140715 +#define YYPATCH 20200330 #define YYEMPTY (-1) #define yyclearin (yychar = YYEMPTY) @@ -13,6 +13,9 @@ #define YYRECOVERING() (yyerrflag != 0) #define YYENOMEM (-2) #define YYEOF 0 +#undef YYBTYACC +#define YYBTYACC 0 +#define YYDEBUGSTR YYPREFIX "debug" #define YYPREFIX "yy" #define YYPURE 0 @@ -60,6 +63,10 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL # define YYLEX yylex() #endif +#if !(defined(yylex) || defined(YYSTATE)) +int YYLEX_DECL(); +#endif + /* Parameters sent to yyerror. */ #ifndef YYERROR_DECL #define YYERROR_DECL() yyerror(const char *s) @@ -126,6 +133,16 @@ static const YYINT yydefred[] = { 0, 0, 0, 0, 0, 0, 31, 0, 10, 14, 15, 16, 17, 12, 13, 19, 0, 0, 0, 26, 27, }; +#if defined(YYDESTRUCT_CALL) || defined(YYSTYPE_TOSTRING) +static const YYINT yystos[] = { 0, + 263, 266, 269, 271, 275, 277, 278, 279, 286, 287, + 288, 289, 290, 292, 293, 294, 295, 296, 297, 298, + 299, 300, 301, 302, 278, 302, 275, 294, 294, 294, + 294, 265, 264, 257, 258, 259, 260, 261, 262, 267, + 268, 270, 271, 272, 273, 276, 295, 296, 297, 297, + 297, 297, 297, 297, 278, 299, 300, 300, 301, 301, +}; +#endif /* YYDESTRUCT_CALL || YYSTYPE_TOSTRING */ static const YYINT yydgoto[] = { 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, }; @@ -145,6 +162,16 @@ static const YYINT yyrindex[] = { 0, 0, 0, 0, 0, 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 74, 21, 41, 0, 0, }; +#if YYBTYACC +static const YYINT yycindex[] = { 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; +#endif static const YYINT yygindex[] = { 0, 0, -4, 14, 24, 34, 0, 36, 6, 31, 76, }; @@ -227,6 +254,47 @@ static const YYINT yycheck[] = { 278, 264, 265, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 276, }; +#if YYBTYACC +static const YYINT yyctable[] = { -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, +}; +#endif #define YYFINAL 14 #ifndef YYDEBUG #define YYDEBUG 0 @@ -237,19 +305,20 @@ static const YYINT yycheck[] = { 278, #if YYDEBUG static const char *const yyname[] = { -"end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +"$end",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"TAO_GT","TAO_GE","TAO_LT", +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"error","TAO_GT","TAO_GE","TAO_LT", "TAO_LE","TAO_EQ","TAO_NE","TAO_EXIST","TAO_AND","TAO_OR","TAO_NOT","TAO_IN", "TAO_TWIDDLE","TAO_BOOLEAN","TAO_PLUS","TAO_MINUS","TAO_MULT","TAO_DIV", "TAO_UMINUS","TAO_NUMBER","TAO_RPAREN","TAO_LPAREN","TAO_IDENT","TAO_STRING", "TAO_UNKNOWN","TAO_SIGNED","TAO_UNSIGNED","TAO_DOUBLE","TAO_CONSTRAINT", -"TAO_SEQUENCE","TAO_WITH","TAO_MAX","TAO_MIN","TAO_FIRST","TAO_RANDOM",0,0,0,0, -0,0,0,0,0,0,0,0,"illegal-symbol", +"TAO_SEQUENCE","TAO_WITH","TAO_MAX","TAO_MIN","TAO_FIRST","TAO_RANDOM", +"$accept","constraint","preference","bool_or","bool_and","bool_compare", +"expr_in","expr_twiddle","expr","term","factor_not","factor","illegal-symbol", }; static const char *const yyrule[] = { "$accept : constraint", @@ -294,13 +363,49 @@ static const char *const yyrule[] = { }; #endif +#if YYDEBUG int yydebug; -int yynerrs; +#endif int yyerrflag; int yychar; YYSTYPE yyval; YYSTYPE yylval; +int yynerrs; + +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) +YYLTYPE yyloc; /* position returned by actions */ +YYLTYPE yylloc; /* position from the lexer */ +#endif + +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) +#ifndef YYLLOC_DEFAULT +#define YYLLOC_DEFAULT(loc, rhs, n) \ +do \ +{ \ + if (n == 0) \ + { \ + (loc).first_line = YYRHSLOC(rhs, 0).last_line; \ + (loc).first_column = YYRHSLOC(rhs, 0).last_column; \ + (loc).last_line = YYRHSLOC(rhs, 0).last_line; \ + (loc).last_column = YYRHSLOC(rhs, 0).last_column; \ + } \ + else \ + { \ + (loc).first_line = YYRHSLOC(rhs, 1).first_line; \ + (loc).first_column = YYRHSLOC(rhs, 1).first_column; \ + (loc).last_line = YYRHSLOC(rhs, n).last_line; \ + (loc).last_column = YYRHSLOC(rhs, n).last_column; \ + } \ +} while (0) +#endif /* YYLLOC_DEFAULT */ +#endif /* defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) */ +#if YYBTYACC + +#ifndef YYLVQUEUEGROWTH +#define YYLVQUEUEGROWTH 32 +#endif +#endif /* YYBTYACC */ /* define the initial stack-sizes */ #ifdef YYSTACKSIZE @@ -315,7 +420,9 @@ YYSTYPE yylval; #endif #endif +#ifndef YYINITSTACKSIZE #define YYINITSTACKSIZE 200 +#endif typedef struct { unsigned stacksize; @@ -324,14 +431,76 @@ typedef struct { YYINT *s_last; YYSTYPE *l_base; YYSTYPE *l_mark; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + YYLTYPE *p_base; + YYLTYPE *p_mark; +#endif } YYSTACKDATA; +#if YYBTYACC + +struct YYParseState_s +{ + struct YYParseState_s *save; /* Previously saved parser state */ + YYSTACKDATA yystack; /* saved parser stack */ + int state; /* saved parser state */ + int errflag; /* saved error recovery status */ + int lexeme; /* saved index of the conflict lexeme in the lexical queue */ + YYINT ctry; /* saved index in yyctable[] for this conflict */ +}; +typedef struct YYParseState_s YYParseState; +#endif /* YYBTYACC */ /* variables for the parser stack */ static YYSTACKDATA yystack; +#if YYBTYACC + +/* Current parser state */ +static YYParseState *yyps = 0; + +/* yypath != 0: do the full parse, starting at *yypath parser state. */ +static YYParseState *yypath = 0; + +/* Base of the lexical value queue */ +static YYSTYPE *yylvals = 0; + +/* Current position at lexical value queue */ +static YYSTYPE *yylvp = 0; + +/* End position of lexical value queue */ +static YYSTYPE *yylve = 0; + +/* The last allocated position at the lexical value queue */ +static YYSTYPE *yylvlim = 0; + +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) +/* Base of the lexical position queue */ +static YYLTYPE *yylpsns = 0; + +/* Current position at lexical position queue */ +static YYLTYPE *yylpp = 0; + +/* End position of lexical position queue */ +static YYLTYPE *yylpe = 0; + +/* The last allocated position at the lexical position queue */ +static YYLTYPE *yylplim = 0; +#endif + +/* Current position at lexical token queue */ +static YYINT *yylexp = 0; + +static YYINT *yylexemes = 0; +#endif /* YYBTYACC */ //extern int yydebug = 1; +/* For use in generated program */ +#define yydepth (int)(yystack.s_mark - yystack.s_base) +#if YYBTYACC +#define yytrial (yyps->save) +#endif /* YYBTYACC */ + #if YYDEBUG -#include <stdio.h> /* needed for printf */ +#include <stdio.h> /* needed for printf */ #endif #include <stdlib.h> /* needed for malloc, etc */ @@ -344,6 +513,9 @@ static int yygrowstack(YYSTACKDATA *data) unsigned newsize; YYINT *newss; YYSTYPE *newvs; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + YYLTYPE *newps; +#endif if ((newsize = data->stacksize) == 0) newsize = YYINITSTACKSIZE; @@ -367,8 +539,22 @@ static int yygrowstack(YYSTACKDATA *data) data->l_base = newvs; data->l_mark = newvs + i; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + newps = (YYLTYPE *)realloc(data->p_base, newsize * sizeof(*newps)); + if (newps == 0) + return YYENOMEM; + + data->p_base = newps; + data->p_mark = newps + i; +#endif + data->stacksize = newsize; data->s_last = data->s_base + newsize - 1; + +#if YYDEBUG + if (yydebug) + fprintf(stderr, "%sdebug: stack size increased to %d\n", YYPREFIX, newsize); +#endif return 0; } @@ -377,21 +563,75 @@ static void yyfreestack(YYSTACKDATA *data) { free(data->s_base); free(data->l_base); +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + free(data->p_base); +#endif memset(data, 0, sizeof(*data)); } #else #define yyfreestack(data) /* nothing */ +#endif /* YYPURE || defined(YY_NO_LEAKS) */ +#if YYBTYACC + +static YYParseState * +yyNewState(unsigned size) +{ + YYParseState *p = (YYParseState *) malloc(sizeof(YYParseState)); + if (p == 0) return 0; + + p->yystack.stacksize = size; + if (size == 0) + { + p->yystack.s_base = 0; + p->yystack.l_base = 0; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + p->yystack.p_base = 0; +#endif + return p; + } + p->yystack.s_base = (YYINT *) malloc(size * sizeof(YYINT)); + if (p->yystack.s_base == 0) return 0; + p->yystack.l_base = (YYSTYPE *) malloc(size * sizeof(YYSTYPE)); + if (p->yystack.l_base == 0) return 0; + memset(p->yystack.l_base, 0, size * sizeof(YYSTYPE)); +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + p->yystack.p_base = (YYLTYPE *) malloc(size * sizeof(YYLTYPE)); + if (p->yystack.p_base == 0) return 0; + memset(p->yystack.p_base, 0, size * sizeof(YYLTYPE)); #endif + return p; +} + +static void +yyFreeState(YYParseState *p) +{ + yyfreestack(&p->yystack); + free(p); +} +#endif /* YYBTYACC */ + #define YYABORT goto yyabort #define YYREJECT goto yyabort #define YYACCEPT goto yyaccept #define YYERROR goto yyerrlab +#if YYBTYACC +#define YYVALID do { if (yyps->save) goto yyvalid; } while(0) +#define YYVALID_NESTED do { if (yyps->save && \ + yyps->save->save == 0) goto yyvalid; } while(0) +#endif /* YYBTYACC */ int YYPARSE_DECL() { - int yym, yyn, yystate; + int yym, yyn, yystate, yyresult; +#if YYBTYACC + int yynewerrflag; + YYParseState *yyerrctx = 0; +#endif /* YYBTYACC */ +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + YYLTYPE yyerror_loc_range[3]; /* position of error start/end (0 unused) */ +#endif #if YYDEBUG const char *yys; @@ -401,8 +641,19 @@ YYPARSE_DECL() if (yyn >= '0' && yyn <= '9') yydebug = yyn - '0'; } + if (yydebug) + fprintf(stderr, "%sdebug[<# of symbols on state stack>]\n", YYPREFIX); +#endif +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + memset(yyerror_loc_range, 0, sizeof(yyerror_loc_range)); #endif +#if YYBTYACC + yyps = yyNewState(0); if (yyps == 0) goto yyenomem; + yyps->save = 0; +#endif /* YYBTYACC */ + yym = 0; + yyn = 0; yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -415,6 +666,9 @@ YYPARSE_DECL() if (yystack.s_base == 0 && yygrowstack(&yystack) == YYENOMEM) goto yyoverflow; yystack.s_mark = yystack.s_base; yystack.l_mark = yystack.l_base; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + yystack.p_mark = yystack.p_base; +#endif yystate = 0; *yystack.s_mark = 0; @@ -422,48 +676,358 @@ yyloop: if ((yyn = yydefred[yystate]) != 0) goto yyreduce; if (yychar < 0) { - if ((yychar = YYLEX) < 0) yychar = YYEOF; +#if YYBTYACC + do { + if (yylvp < yylve) + { + /* we're currently re-reading tokens */ + yylval = *yylvp++; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + yylloc = *yylpp++; +#endif + yychar = *yylexp++; + break; + } + if (yyps->save) + { + /* in trial mode; save scanner results for future parse attempts */ + if (yylvp == yylvlim) + { /* Enlarge lexical value queue */ + size_t p = (size_t) (yylvp - yylvals); + size_t s = (size_t) (yylvlim - yylvals); + + s += YYLVQUEUEGROWTH; + if ((yylexemes = (YYINT *)realloc(yylexemes, s * sizeof(YYINT))) == 0) goto yyenomem; + if ((yylvals = (YYSTYPE *)realloc(yylvals, s * sizeof(YYSTYPE))) == 0) goto yyenomem; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + if ((yylpsns = (YYLTYPE *)realloc(yylpsns, s * sizeof(YYLTYPE))) == 0) goto yyenomem; +#endif + yylvp = yylve = yylvals + p; + yylvlim = yylvals + s; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + yylpp = yylpe = yylpsns + p; + yylplim = yylpsns + s; +#endif + yylexp = yylexemes + p; + } + *yylexp = (YYINT) YYLEX; + *yylvp++ = yylval; + yylve++; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + *yylpp++ = yylloc; + yylpe++; +#endif + yychar = *yylexp++; + break; + } + /* normal operation, no conflict encountered */ +#endif /* YYBTYACC */ + yychar = YYLEX; +#if YYBTYACC + } while (0); +#endif /* YYBTYACC */ + if (yychar < 0) yychar = YYEOF; #if YYDEBUG if (yydebug) { - yys = yyname[YYTRANSLATE(yychar)]; - printf("%sdebug: state %d, reading %d (%s)\n", - YYPREFIX, yystate, yychar, yys); + if ((yys = yyname[YYTRANSLATE(yychar)]) == 0) yys = yyname[YYUNDFTOKEN]; + fprintf(stderr, "%s[%d]: state %d, reading token %d (%s)", + YYDEBUGSTR, yydepth, yystate, yychar, yys); +#ifdef YYSTYPE_TOSTRING +#if YYBTYACC + if (!yytrial) +#endif /* YYBTYACC */ + fprintf(stderr, " <%s>", YYSTYPE_TOSTRING(yychar, yylval)); +#endif + fputc('\n', stderr); } #endif } - if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 && - yyn <= YYTABLESIZE && yycheck[yyn] == yychar) +#if YYBTYACC + + /* Do we have a conflict? */ + if (((yyn = yycindex[yystate]) != 0) && (yyn += yychar) >= 0 && + yyn <= YYTABLESIZE && yycheck[yyn] == (YYINT) yychar) { + YYINT ctry; + + if (yypath) + { + YYParseState *save; #if YYDEBUG - if (yydebug) - printf("%sdebug: state %d, shifting to state %d\n", - YYPREFIX, yystate, yytable[yyn]); + if (yydebug) + fprintf(stderr, "%s[%d]: CONFLICT in state %d: following successful trial parse\n", + YYDEBUGSTR, yydepth, yystate); #endif - if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM) + /* Switch to the next conflict context */ + save = yypath; + yypath = save->save; + save->save = 0; + ctry = save->ctry; + if (save->state != yystate) YYABORT; + yyFreeState(save); + + } + else { - goto yyoverflow; + + /* Unresolved conflict - start/continue trial parse */ + YYParseState *save; +#if YYDEBUG + if (yydebug) + { + fprintf(stderr, "%s[%d]: CONFLICT in state %d. ", YYDEBUGSTR, yydepth, yystate); + if (yyps->save) + fputs("ALREADY in conflict, continuing trial parse.\n", stderr); + else + fputs("Starting trial parse.\n", stderr); + } +#endif + save = yyNewState((unsigned)(yystack.s_mark - yystack.s_base + 1)); + if (save == 0) goto yyenomem; + save->save = yyps->save; + save->state = yystate; + save->errflag = yyerrflag; + save->yystack.s_mark = save->yystack.s_base + (yystack.s_mark - yystack.s_base); + memcpy (save->yystack.s_base, yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(YYINT)); + save->yystack.l_mark = save->yystack.l_base + (yystack.l_mark - yystack.l_base); + memcpy (save->yystack.l_base, yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE)); +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + save->yystack.p_mark = save->yystack.p_base + (yystack.p_mark - yystack.p_base); + memcpy (save->yystack.p_base, yystack.p_base, (size_t) (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE)); +#endif + ctry = yytable[yyn]; + if (yyctable[ctry] == -1) + { +#if YYDEBUG + if (yydebug && yychar >= YYEOF) + fprintf(stderr, "%s[%d]: backtracking 1 token\n", YYDEBUGSTR, yydepth); +#endif + ctry++; + } + save->ctry = ctry; + if (yyps->save == 0) + { + /* If this is a first conflict in the stack, start saving lexemes */ + if (!yylexemes) + { + yylexemes = (YYINT *) malloc((YYLVQUEUEGROWTH) * sizeof(YYINT)); + if (yylexemes == 0) goto yyenomem; + yylvals = (YYSTYPE *) malloc((YYLVQUEUEGROWTH) * sizeof(YYSTYPE)); + if (yylvals == 0) goto yyenomem; + yylvlim = yylvals + YYLVQUEUEGROWTH; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + yylpsns = (YYLTYPE *) malloc((YYLVQUEUEGROWTH) * sizeof(YYLTYPE)); + if (yylpsns == 0) goto yyenomem; + yylplim = yylpsns + YYLVQUEUEGROWTH; +#endif + } + if (yylvp == yylve) + { + yylvp = yylve = yylvals; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + yylpp = yylpe = yylpsns; +#endif + yylexp = yylexemes; + if (yychar >= YYEOF) + { + *yylve++ = yylval; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + *yylpe++ = yylloc; +#endif + *yylexp = (YYINT) yychar; + yychar = YYEMPTY; + } + } + } + if (yychar >= YYEOF) + { + yylvp--; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + yylpp--; +#endif + yylexp--; + yychar = YYEMPTY; + } + save->lexeme = (int) (yylvp - yylvals); + yyps->save = save; + } + if (yytable[yyn] == ctry) + { +#if YYDEBUG + if (yydebug) + fprintf(stderr, "%s[%d]: state %d, shifting to state %d\n", + YYDEBUGSTR, yydepth, yystate, yyctable[ctry]); +#endif + if (yychar < 0) + { + yylvp++; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + yylpp++; +#endif + yylexp++; + } + if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM) + goto yyoverflow; + yystate = yyctable[ctry]; + *++yystack.s_mark = (YYINT) yystate; + *++yystack.l_mark = yylval; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + *++yystack.p_mark = yylloc; +#endif + yychar = YYEMPTY; + if (yyerrflag > 0) --yyerrflag; + goto yyloop; } + else + { + yyn = yyctable[ctry]; + goto yyreduce; + } + } /* End of code dealing with conflicts */ +#endif /* YYBTYACC */ + if (((yyn = yysindex[yystate]) != 0) && (yyn += yychar) >= 0 && + yyn <= YYTABLESIZE && yycheck[yyn] == (YYINT) yychar) + { +#if YYDEBUG + if (yydebug) + fprintf(stderr, "%s[%d]: state %d, shifting to state %d\n", + YYDEBUGSTR, yydepth, yystate, yytable[yyn]); +#endif + if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM) goto yyoverflow; yystate = yytable[yyn]; *++yystack.s_mark = yytable[yyn]; *++yystack.l_mark = yylval; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + *++yystack.p_mark = yylloc; +#endif yychar = YYEMPTY; if (yyerrflag > 0) --yyerrflag; goto yyloop; } - if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 && - yyn <= YYTABLESIZE && yycheck[yyn] == yychar) + if (((yyn = yyrindex[yystate]) != 0) && (yyn += yychar) >= 0 && + yyn <= YYTABLESIZE && yycheck[yyn] == (YYINT) yychar) { yyn = yytable[yyn]; goto yyreduce; } - if (yyerrflag) goto yyinrecovery; + if (yyerrflag != 0) goto yyinrecovery; +#if YYBTYACC - YYERROR_CALL("syntax error"); + yynewerrflag = 1; + goto yyerrhandler; + goto yyerrlab; /* redundant goto avoids 'unused label' warning */ - goto yyerrlab; +yyerrlab: + /* explicit YYERROR from an action -- pop the rhs of the rule reduced + * before looking for error recovery */ + yystack.s_mark -= yym; + yystate = *yystack.s_mark; + yystack.l_mark -= yym; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + yystack.p_mark -= yym; +#endif + + yynewerrflag = 0; +yyerrhandler: + while (yyps->save) + { + int ctry; + YYParseState *save = yyps->save; +#if YYDEBUG + if (yydebug) + fprintf(stderr, "%s[%d]: ERROR in state %d, CONFLICT BACKTRACKING to state %d, %d tokens\n", + YYDEBUGSTR, yydepth, yystate, yyps->save->state, + (int)(yylvp - yylvals - yyps->save->lexeme)); +#endif + /* Memorize most forward-looking error state in case it's really an error. */ + if (yyerrctx == 0 || yyerrctx->lexeme < yylvp - yylvals) + { + /* Free old saved error context state */ + if (yyerrctx) yyFreeState(yyerrctx); + /* Create and fill out new saved error context state */ + yyerrctx = yyNewState((unsigned)(yystack.s_mark - yystack.s_base + 1)); + if (yyerrctx == 0) goto yyenomem; + yyerrctx->save = yyps->save; + yyerrctx->state = yystate; + yyerrctx->errflag = yyerrflag; + yyerrctx->yystack.s_mark = yyerrctx->yystack.s_base + (yystack.s_mark - yystack.s_base); + memcpy (yyerrctx->yystack.s_base, yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(YYINT)); + yyerrctx->yystack.l_mark = yyerrctx->yystack.l_base + (yystack.l_mark - yystack.l_base); + memcpy (yyerrctx->yystack.l_base, yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE)); +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + yyerrctx->yystack.p_mark = yyerrctx->yystack.p_base + (yystack.p_mark - yystack.p_base); + memcpy (yyerrctx->yystack.p_base, yystack.p_base, (size_t) (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE)); +#endif + yyerrctx->lexeme = (int) (yylvp - yylvals); + } + yylvp = yylvals + save->lexeme; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + yylpp = yylpsns + save->lexeme; +#endif + yylexp = yylexemes + save->lexeme; + yychar = YYEMPTY; + yystack.s_mark = yystack.s_base + (save->yystack.s_mark - save->yystack.s_base); + memcpy (yystack.s_base, save->yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(YYINT)); + yystack.l_mark = yystack.l_base + (save->yystack.l_mark - save->yystack.l_base); + memcpy (yystack.l_base, save->yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE)); +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + yystack.p_mark = yystack.p_base + (save->yystack.p_mark - save->yystack.p_base); + memcpy (yystack.p_base, save->yystack.p_base, (size_t) (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE)); +#endif + ctry = ++save->ctry; + yystate = save->state; + /* We tried shift, try reduce now */ + if ((yyn = yyctable[ctry]) >= 0) goto yyreduce; + yyps->save = save->save; + save->save = 0; + yyFreeState(save); + + /* Nothing left on the stack -- error */ + if (!yyps->save) + { +#if YYDEBUG + if (yydebug) + fprintf(stderr, "%sdebug[%d,trial]: trial parse FAILED, entering ERROR mode\n", + YYPREFIX, yydepth); +#endif + /* Restore state as it was in the most forward-advanced error */ + yylvp = yylvals + yyerrctx->lexeme; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + yylpp = yylpsns + yyerrctx->lexeme; +#endif + yylexp = yylexemes + yyerrctx->lexeme; + yychar = yylexp[-1]; + yylval = yylvp[-1]; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + yylloc = yylpp[-1]; +#endif + yystack.s_mark = yystack.s_base + (yyerrctx->yystack.s_mark - yyerrctx->yystack.s_base); + memcpy (yystack.s_base, yyerrctx->yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(YYINT)); + yystack.l_mark = yystack.l_base + (yyerrctx->yystack.l_mark - yyerrctx->yystack.l_base); + memcpy (yystack.l_base, yyerrctx->yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE)); +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + yystack.p_mark = yystack.p_base + (yyerrctx->yystack.p_mark - yyerrctx->yystack.p_base); + memcpy (yystack.p_base, yyerrctx->yystack.p_base, (size_t) (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE)); +#endif + yystate = yyerrctx->state; + yyFreeState(yyerrctx); + yyerrctx = 0; + } + yynewerrflag = 1; + } + if (yynewerrflag == 0) goto yyinrecovery; +#endif /* YYBTYACC */ + + YYERROR_CALL("syntax error"); +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + yyerror_loc_range[1] = yylloc; /* lookahead position is error start position */ +#endif +#if !YYBTYACC + goto yyerrlab; /* redundant goto avoids 'unused label' warning */ yyerrlab: +#endif ++yynerrs; yyinrecovery: @@ -472,33 +1036,55 @@ yyinrecovery: yyerrflag = 3; for (;;) { - if ((yyn = yysindex[*yystack.s_mark]) && (yyn += YYERRCODE) >= 0 && - yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE) + if (((yyn = yysindex[*yystack.s_mark]) != 0) && (yyn += YYERRCODE) >= 0 && + yyn <= YYTABLESIZE && yycheck[yyn] == (YYINT) YYERRCODE) { #if YYDEBUG if (yydebug) - printf("%sdebug: state %d, error recovery shifting\ - to state %d\n", YYPREFIX, *yystack.s_mark, yytable[yyn]); + fprintf(stderr, "%s[%d]: state %d, error recovery shifting to state %d\n", + YYDEBUGSTR, yydepth, *yystack.s_mark, yytable[yyn]); #endif - if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM) - { - goto yyoverflow; - } + if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM) goto yyoverflow; yystate = yytable[yyn]; *++yystack.s_mark = yytable[yyn]; *++yystack.l_mark = yylval; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + /* lookahead position is error end position */ + yyerror_loc_range[2] = yylloc; + YYLLOC_DEFAULT(yyloc, yyerror_loc_range, 2); /* position of error span */ + *++yystack.p_mark = yyloc; +#endif goto yyloop; } else { #if YYDEBUG if (yydebug) - printf("%sdebug: error recovery discarding state %d\n", - YYPREFIX, *yystack.s_mark); + fprintf(stderr, "%s[%d]: error recovery discarding state %d\n", + YYDEBUGSTR, yydepth, *yystack.s_mark); #endif if (yystack.s_mark <= yystack.s_base) goto yyabort; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + /* the current TOS position is the error start position */ + yyerror_loc_range[1] = *yystack.p_mark; +#endif +#if defined(YYDESTRUCT_CALL) +#if YYBTYACC + if (!yytrial) +#endif /* YYBTYACC */ +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + YYDESTRUCT_CALL("error: discarding state", + yystos[*yystack.s_mark], yystack.l_mark, yystack.p_mark); +#else + YYDESTRUCT_CALL("error: discarding state", + yystos[*yystack.s_mark], yystack.l_mark); +#endif /* defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) */ +#endif /* defined(YYDESTRUCT_CALL) */ --yystack.s_mark; --yystack.l_mark; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + --yystack.p_mark; +#endif } } } @@ -508,26 +1094,71 @@ yyinrecovery: #if YYDEBUG if (yydebug) { - yys = yyname[YYTRANSLATE(yychar)]; - printf("%sdebug: state %d, error recovery discards token %d (%s)\n", - YYPREFIX, yystate, yychar, yys); + if ((yys = yyname[YYTRANSLATE(yychar)]) == 0) yys = yyname[YYUNDFTOKEN]; + fprintf(stderr, "%s[%d]: state %d, error recovery discarding token %d (%s)\n", + YYDEBUGSTR, yydepth, yystate, yychar, yys); } #endif +#if defined(YYDESTRUCT_CALL) +#if YYBTYACC + if (!yytrial) +#endif /* YYBTYACC */ +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + YYDESTRUCT_CALL("error: discarding token", yychar, &yylval, &yylloc); +#else + YYDESTRUCT_CALL("error: discarding token", yychar, &yylval); +#endif /* defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) */ +#endif /* defined(YYDESTRUCT_CALL) */ yychar = YYEMPTY; goto yyloop; } yyreduce: + yym = yylen[yyn]; #if YYDEBUG if (yydebug) - printf("%sdebug: state %d, reducing by rule %d (%s)\n", - YYPREFIX, yystate, yyn, yyrule[yyn]); + { + fprintf(stderr, "%s[%d]: state %d, reducing by rule %d (%s)", + YYDEBUGSTR, yydepth, yystate, yyn, yyrule[yyn]); +#ifdef YYSTYPE_TOSTRING +#if YYBTYACC + if (!yytrial) +#endif /* YYBTYACC */ + if (yym > 0) + { + int i; + fputc('<', stderr); + for (i = yym; i > 0; i--) + { + if (i != yym) fputs(", ", stderr); + fputs(YYSTYPE_TOSTRING(yystos[yystack.s_mark[1-i]], + yystack.l_mark[1-i]), stderr); + } + fputc('>', stderr); + } #endif - yym = yylen[yyn]; - if (yym) + fputc('\n', stderr); + } +#endif + if (yym > 0) yyval = yystack.l_mark[1-yym]; else memset(&yyval, 0, sizeof yyval); +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + + /* Perform position reduction */ + memset(&yyloc, 0, sizeof(yyloc)); +#if YYBTYACC + if (!yytrial) +#endif /* YYBTYACC */ + { + YYLLOC_DEFAULT(yyloc, &yystack.p_mark[-yym], yym); + /* just in case YYERROR is invoked within the action, save + the start of the rhs as the error start position */ + yyerror_loc_range[1] = yystack.p_mark[1-yym]; + } +#endif + switch (yyn) { case 1: @@ -641,63 +1272,238 @@ break; case 37: { yyval.constraint_ = yystack.l_mark[0].constraint_; } break; + default: + break; } yystack.s_mark -= yym; yystate = *yystack.s_mark; yystack.l_mark -= yym; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + yystack.p_mark -= yym; +#endif yym = yylhs[yyn]; if (yystate == 0 && yym == 0) { #if YYDEBUG if (yydebug) - printf("%sdebug: after reduction, shifting from state 0 to\ - state %d\n", YYPREFIX, YYFINAL); + { + fprintf(stderr, "%s[%d]: after reduction, ", YYDEBUGSTR, yydepth); +#ifdef YYSTYPE_TOSTRING +#if YYBTYACC + if (!yytrial) +#endif /* YYBTYACC */ + fprintf(stderr, "result is <%s>, ", YYSTYPE_TOSTRING(yystos[YYFINAL], yyval)); +#endif + fprintf(stderr, "shifting from state 0 to final state %d\n", YYFINAL); + } #endif yystate = YYFINAL; *++yystack.s_mark = YYFINAL; *++yystack.l_mark = yyval; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + *++yystack.p_mark = yyloc; +#endif if (yychar < 0) { - if ((yychar = YYLEX) < 0) yychar = YYEOF; +#if YYBTYACC + do { + if (yylvp < yylve) + { + /* we're currently re-reading tokens */ + yylval = *yylvp++; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + yylloc = *yylpp++; +#endif + yychar = *yylexp++; + break; + } + if (yyps->save) + { + /* in trial mode; save scanner results for future parse attempts */ + if (yylvp == yylvlim) + { /* Enlarge lexical value queue */ + size_t p = (size_t) (yylvp - yylvals); + size_t s = (size_t) (yylvlim - yylvals); + + s += YYLVQUEUEGROWTH; + if ((yylexemes = (YYINT *)realloc(yylexemes, s * sizeof(YYINT))) == 0) + goto yyenomem; + if ((yylvals = (YYSTYPE *)realloc(yylvals, s * sizeof(YYSTYPE))) == 0) + goto yyenomem; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + if ((yylpsns = (YYLTYPE *)realloc(yylpsns, s * sizeof(YYLTYPE))) == 0) + goto yyenomem; +#endif + yylvp = yylve = yylvals + p; + yylvlim = yylvals + s; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + yylpp = yylpe = yylpsns + p; + yylplim = yylpsns + s; +#endif + yylexp = yylexemes + p; + } + *yylexp = (YYINT) YYLEX; + *yylvp++ = yylval; + yylve++; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + *yylpp++ = yylloc; + yylpe++; +#endif + yychar = *yylexp++; + break; + } + /* normal operation, no conflict encountered */ +#endif /* YYBTYACC */ + yychar = YYLEX; +#if YYBTYACC + } while (0); +#endif /* YYBTYACC */ + if (yychar < 0) yychar = YYEOF; #if YYDEBUG if (yydebug) { - yys = yyname[YYTRANSLATE(yychar)]; - printf("%sdebug: state %d, reading %d (%s)\n", - YYPREFIX, YYFINAL, yychar, yys); + if ((yys = yyname[YYTRANSLATE(yychar)]) == 0) yys = yyname[YYUNDFTOKEN]; + fprintf(stderr, "%s[%d]: state %d, reading token %d (%s)\n", + YYDEBUGSTR, yydepth, YYFINAL, yychar, yys); } #endif } if (yychar == YYEOF) goto yyaccept; goto yyloop; } - if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 && - yyn <= YYTABLESIZE && yycheck[yyn] == yystate) + if (((yyn = yygindex[yym]) != 0) && (yyn += yystate) >= 0 && + yyn <= YYTABLESIZE && yycheck[yyn] == (YYINT) yystate) yystate = yytable[yyn]; else yystate = yydgoto[yym]; #if YYDEBUG if (yydebug) - printf("%sdebug: after reduction, shifting from state %d \ -to state %d\n", YYPREFIX, *yystack.s_mark, yystate); -#endif - if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM) { - goto yyoverflow; + fprintf(stderr, "%s[%d]: after reduction, ", YYDEBUGSTR, yydepth); +#ifdef YYSTYPE_TOSTRING +#if YYBTYACC + if (!yytrial) +#endif /* YYBTYACC */ + fprintf(stderr, "result is <%s>, ", YYSTYPE_TOSTRING(yystos[yystate], yyval)); +#endif + fprintf(stderr, "shifting from state %d to state %d\n", *yystack.s_mark, yystate); } +#endif + if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM) goto yyoverflow; *++yystack.s_mark = (YYINT) yystate; *++yystack.l_mark = yyval; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + *++yystack.p_mark = yyloc; +#endif + goto yyloop; +#if YYBTYACC + + /* Reduction declares that this path is valid. Set yypath and do a full parse */ +yyvalid: + if (yypath) YYABORT; + while (yyps->save) + { + YYParseState *save = yyps->save; + yyps->save = save->save; + save->save = yypath; + yypath = save; + } +#if YYDEBUG + if (yydebug) + fprintf(stderr, "%s[%d]: state %d, CONFLICT trial successful, backtracking to state %d, %d tokens\n", + YYDEBUGSTR, yydepth, yystate, yypath->state, (int)(yylvp - yylvals - yypath->lexeme)); +#endif + if (yyerrctx) + { + yyFreeState(yyerrctx); + yyerrctx = 0; + } + yylvp = yylvals + yypath->lexeme; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + yylpp = yylpsns + yypath->lexeme; +#endif + yylexp = yylexemes + yypath->lexeme; + yychar = YYEMPTY; + yystack.s_mark = yystack.s_base + (yypath->yystack.s_mark - yypath->yystack.s_base); + memcpy (yystack.s_base, yypath->yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(YYINT)); + yystack.l_mark = yystack.l_base + (yypath->yystack.l_mark - yypath->yystack.l_base); + memcpy (yystack.l_base, yypath->yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE)); +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + yystack.p_mark = yystack.p_base + (yypath->yystack.p_mark - yypath->yystack.p_base); + memcpy (yystack.p_base, yypath->yystack.p_base, (size_t) (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE)); +#endif + yystate = yypath->state; goto yyloop; +#endif /* YYBTYACC */ yyoverflow: YYERROR_CALL("yacc stack overflow"); +#if YYBTYACC + goto yyabort_nomem; +yyenomem: + YYERROR_CALL("memory exhausted"); +yyabort_nomem: +#endif /* YYBTYACC */ + yyresult = 2; + goto yyreturn; yyabort: - yyfreestack(&yystack); - return (1); + yyresult = 1; + goto yyreturn; yyaccept: +#if YYBTYACC + if (yyps->save) goto yyvalid; +#endif /* YYBTYACC */ + yyresult = 0; + +yyreturn: +#if defined(YYDESTRUCT_CALL) + if (yychar != YYEOF && yychar != YYEMPTY) +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + YYDESTRUCT_CALL("cleanup: discarding token", yychar, &yylval, &yylloc); +#else + YYDESTRUCT_CALL("cleanup: discarding token", yychar, &yylval); +#endif /* defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) */ + + { + YYSTYPE *pv; +#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) + YYLTYPE *pp; + + for (pv = yystack.l_base, pp = yystack.p_base; pv <= yystack.l_mark; ++pv, ++pp) + YYDESTRUCT_CALL("cleanup: discarding state", + yystos[*(yystack.s_base + (pv - yystack.l_base))], pv, pp); +#else + for (pv = yystack.l_base; pv <= yystack.l_mark; ++pv) + YYDESTRUCT_CALL("cleanup: discarding state", + yystos[*(yystack.s_base + (pv - yystack.l_base))], pv); +#endif /* defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED) */ + } +#endif /* defined(YYDESTRUCT_CALL) */ + +#if YYBTYACC + if (yyerrctx) + { + yyFreeState(yyerrctx); + yyerrctx = 0; + } + while (yyps) + { + YYParseState *save = yyps; + yyps = save->save; + save->save = 0; + yyFreeState(save); + } + while (yypath) + { + YYParseState *save = yypath; + yypath = save->save; + save->save = 0; + yyFreeState(save); + } +#endif /* YYBTYACC */ yyfreestack(&yystack); - return (0); + return (yyresult); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h index 1a266adcb1a..f5d8691fdd6 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h @@ -51,7 +51,6 @@ private: static TAO_SYNCH_MUTEX parserMutex__; }; - // Functions we need for parsing. extern int yyparse (void); extern void yyrestart (FILE*); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h index 5d17c007912..ed477f7326e 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h @@ -57,7 +57,6 @@ class TAO_Lookup : public TAO_Import_Attributes<POA_CosTrading::Lookup> { public: - TAO_Lookup (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader); ~TAO_Lookup (void); @@ -153,7 +152,6 @@ public: // END SPEC private: - /// Factory method for creating an appropriate Offer Iterator based /// on the presence of the Register Interface. TAO_Offer_Iterator* create_offer_iterator (const TAO_Property_Filter&); @@ -268,7 +266,6 @@ class TAO_Register : public TAO_Support_Attributes<POA_CosTrading::Register> { public: - TAO_Register (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader); virtual ~TAO_Register (void); @@ -776,17 +773,15 @@ private: TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader_; }; - // ************************************************************* - // TAO_Proxy - // ************************************************************* - +// ************************************************************* +// TAO_Proxy +// ************************************************************* template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> class TAO_Proxy : public TAO_Trader_Components <POA_CosTrading::Proxy>, public TAO_Support_Attributes <POA_CosTrading::Proxy> { public: - TAO_Proxy (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader); ~TAO_Proxy (void); @@ -811,12 +806,10 @@ public: CosTrading::OfferIdIterator_ptr &); private: - // = Disallow these operations. ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &)) ACE_UNIMPLEMENTED_FUNC (TAO_Proxy (const TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &)) - TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>& trader_; }; diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp index ddae3e4cee1..fd8a2e09260 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp @@ -56,7 +56,7 @@ TimeStamp_Protocol_Object::handle_input (void) // ACE_Message_Block(frame_size), // -1); -// ACE_OS_String::memmove (mb->rd_ptr (), iov.iov_base, frame_size); +// ACE_OS::memmove (mb->rd_ptr (), iov.iov_base, frame_size); // mb->wr_ptr (mb->rd_ptr () + frame_size); // // iov_base += frame_size; @@ -83,7 +83,7 @@ TimeStamp_Protocol_Object::handle_input (void) // ACE_DEBUG ((LM_DEBUG, // "(%N|%l) Frame Size %d\n", // n)); -// ACE_OS_String::memmove (this->frame_->rd_ptr (), iov.iov_base, n); +// ACE_OS::memmove (this->frame_->rd_ptr (), iov.iov_base, n); // this->frame_->wr_ptr (this->frame_->rd_ptr () + n); // } // else @@ -98,7 +98,7 @@ TimeStamp_Protocol_Object::handle_input (void) // ACE_Message_Block (frame_size), // -1); -// ACE_OS_String::memmove (mb->rd_ptr (), iov.iov_base, n); +// ACE_OS::memmove (mb->rd_ptr (), iov.iov_base, n); // mb->wr_ptr (mb->rd_ptr () + n); // prev->cont (mb); // } @@ -137,7 +137,7 @@ TimeStamp_Protocol_Object::send_frame (ACE_Message_Block *frame, "Time Stamp %u usecs\n", val_1)); - ACE_OS_String::memcpy (timestamp->wr_ptr (), &now, sizeof (now)); + ACE_OS::memcpy (timestamp->wr_ptr (), &now, sizeof (now)); timestamp->wr_ptr (sizeof (now)); frame->cont (timestamp); diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp index 4cf2470a51c..e470d872208 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp @@ -54,7 +54,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame, frame->rd_ptr (frame_size); ACE_hrtime_t stamp; - ACE_OS_String::memcpy (&stamp, frame->rd_ptr (), sizeof (stamp)); + ACE_OS::memcpy (&stamp, frame->rd_ptr (), sizeof (stamp)); ACE_UINT64 usec = stamp; ACE_UINT32 val_1 = ACE_CU64_TO_CU32 (usec); diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp index 7fbc5c0a2af..044596b76b3 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp @@ -386,9 +386,9 @@ __ace_cc_yy_memcpy (to, from, count) char *from; unsigned int count; { - register char *f = from; - register char *t = to; - register int i = count; + char *f = from; + char *t = to; + int i = count; while (i-- > 0) *t++ = *f++; @@ -401,9 +401,9 @@ __ace_cc_yy_memcpy (to, from, count) static void __ace_cc_yy_memcpy (char *to, char *from, unsigned int count) { - register char *t = to; - register char *f = from; - register int i = count; + char *t = to; + char *f = from; + int i = count; while (i-- > 0) *t++ = *f++; @@ -446,10 +446,10 @@ int ace_cc_yyparse(ACE_CC_YYPARSE_PARAM_ARG) ACE_CC_YYPARSE_PARAM_DECL { - register int ace_cc_yystate; - register int ace_cc_yyn; - register short *ace_cc_yyssp; - register ACE_CC_YYSTYPE *ace_cc_yyvsp; + int ace_cc_yystate; + int ace_cc_yyn; + short *ace_cc_yyssp; + ACE_CC_YYSTYPE *ace_cc_yyvsp; int ace_cc_yyerrstatus; /* number of tokens to shift before error messages enabled */ int ace_cc_yychar1 = 0; /* lookahead token as an internal (translated) token number */ diff --git a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp index 6d74bf08cae..ac1562263fb 100644 --- a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp +++ b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp @@ -604,9 +604,9 @@ ACE_CC_YY_MALLOC_DECL ACE_CC_YY_DECL { - register ace_cc_yy_state_type ace_cc_yy_current_state; - register char *ace_cc_yy_cp = 0, *ace_cc_yy_bp = 0; - register int ace_cc_yy_act; + ace_cc_yy_state_type ace_cc_yy_current_state; + char *ace_cc_yy_cp = 0, *ace_cc_yy_bp = 0; + int ace_cc_yy_act; @@ -654,7 +654,7 @@ ACE_CC_YY_DECL ace_cc_yy_match: do { - register ACE_CC_YY_CHAR ace_cc_yy_c = ace_cc_yy_ec[ACE_CC_YY_SC_TO_UI(*ace_cc_yy_cp)]; + ACE_CC_YY_CHAR ace_cc_yy_c = ace_cc_yy_ec[ACE_CC_YY_SC_TO_UI(*ace_cc_yy_cp)]; if ( ace_cc_yy_accept[ace_cc_yy_current_state] ) { ace_cc_yy_last_accepting_state = ace_cc_yy_current_state; @@ -947,9 +947,9 @@ case ACE_CC_YY_STATE_EOF(INITIAL): static int ace_cc_yy_get_next_buffer() { - register char *dest = ace_cc_yy_current_buffer->ace_cc_yy_ch_buf; - register char *source = ace_cc_yytext_ptr; - register int number_to_move, i; + char *dest = ace_cc_yy_current_buffer->ace_cc_yy_ch_buf; + char *source = ace_cc_yytext_ptr; + int number_to_move, i; int ret_val; if ( ace_cc_yy_c_buf_p > &ace_cc_yy_current_buffer->ace_cc_yy_ch_buf[ace_cc_yy_n_chars + 1] ) @@ -1079,15 +1079,15 @@ static int ace_cc_yy_get_next_buffer() static ace_cc_yy_state_type ace_cc_yy_get_previous_state() { - register ace_cc_yy_state_type ace_cc_yy_current_state; - register char *ace_cc_yy_cp; + ace_cc_yy_state_type ace_cc_yy_current_state; + char *ace_cc_yy_cp; ace_cc_yy_current_state = ace_cc_yy_start; ace_cc_yy_current_state += ACE_CC_YY_AT_BOL(); for ( ace_cc_yy_cp = ace_cc_yytext_ptr + ACE_CC_YY_MORE_ADJ; ace_cc_yy_cp < ace_cc_yy_c_buf_p; ++ace_cc_yy_cp ) { - register ACE_CC_YY_CHAR ace_cc_yy_c = (*ace_cc_yy_cp ? ace_cc_yy_ec[ACE_CC_YY_SC_TO_UI(*ace_cc_yy_cp)] : 1); + ACE_CC_YY_CHAR ace_cc_yy_c = (*ace_cc_yy_cp ? ace_cc_yy_ec[ACE_CC_YY_SC_TO_UI(*ace_cc_yy_cp)] : 1); if ( ace_cc_yy_accept[ace_cc_yy_current_state] ) { ace_cc_yy_last_accepting_state = ace_cc_yy_current_state; @@ -1119,10 +1119,10 @@ static ace_cc_yy_state_type ace_cc_yy_try_NUL_trans( ace_cc_yy_current_state ) ace_cc_yy_state_type ace_cc_yy_current_state; #endif { - register int ace_cc_yy_is_jam; - register char *ace_cc_yy_cp = ace_cc_yy_c_buf_p; + int ace_cc_yy_is_jam; + char *ace_cc_yy_cp = ace_cc_yy_c_buf_p; - register ACE_CC_YY_CHAR ace_cc_yy_c = 1; + ACE_CC_YY_CHAR ace_cc_yy_c = 1; if ( ace_cc_yy_accept[ace_cc_yy_current_state] ) { ace_cc_yy_last_accepting_state = ace_cc_yy_current_state; @@ -1143,14 +1143,14 @@ ace_cc_yy_state_type ace_cc_yy_current_state; #ifndef ACE_CC_YY_NO_UNPUT #ifdef ACE_CC_YY_USE_PROTOS -static void ace_cc_yyunput( int c, register char *ace_cc_yy_bp ) +static void ace_cc_yyunput( int c, char *ace_cc_yy_bp ) #else static void ace_cc_yyunput( c, ace_cc_yy_bp ) int c; -register char *ace_cc_yy_bp; +char *ace_cc_yy_bp; #endif { - register char *ace_cc_yy_cp = ace_cc_yy_c_buf_p; + char *ace_cc_yy_cp = ace_cc_yy_c_buf_p; /* undo effects of setting up ace_cc_yytext */ *ace_cc_yy_cp = ace_cc_yy_hold_char; @@ -1158,10 +1158,10 @@ register char *ace_cc_yy_bp; if ( ace_cc_yy_cp < ace_cc_yy_current_buffer->ace_cc_yy_ch_buf + 2 ) { /* need to shift things up to make room */ /* +2 for EOB chars. */ - register int number_to_move = ace_cc_yy_n_chars + 2; - register char *dest = &ace_cc_yy_current_buffer->ace_cc_yy_ch_buf[ + int number_to_move = ace_cc_yy_n_chars + 2; + char *dest = &ace_cc_yy_current_buffer->ace_cc_yy_ch_buf[ ace_cc_yy_current_buffer->ace_cc_yy_buf_size + 2]; - register char *source = + char *source = &ace_cc_yy_current_buffer->ace_cc_yy_ch_buf[number_to_move]; while ( source > ace_cc_yy_current_buffer->ace_cc_yy_ch_buf ) @@ -1621,7 +1621,7 @@ ace_cc_yyconst char *s2; int n; #endif { - register int i; + int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; } @@ -1635,7 +1635,7 @@ static int ace_cc_yy_flex_strlen( s ) ace_cc_yyconst char *s; #endif { - register int n; + int n; for ( n = 0; s[n]; ++n ) ; diff --git a/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp b/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp index bfba4462981..8c904867a3a 100644 --- a/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp +++ b/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp @@ -164,7 +164,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_TCHAR* which_test = 0; while (0 != (which_test = *++argv)) { - size_t testnum = ACE_OS_String::strtol (which_test, 0, 0); + size_t testnum = ACE_OS::strtol (which_test, 0, 0); if (testnum < numtests) { ExpectedValues results; diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp index db29e15efe0..c66fe3f85be 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp @@ -99,11 +99,11 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) // This could be done with ACE_OS::sprintf() but it requires different // format strings for wide-char POSIX vs. narrow-char POSIX and Windows. // Easier to keep straight like this. - ACE_OS_String::strcpy (temp, test_dir); - ACE_OS_String::strcat (temp, ACE_LOG_DIRECTORY); - ACE_OS_String::strcat + ACE_OS::strcpy (temp, test_dir); + ACE_OS::strcat (temp, ACE_LOG_DIRECTORY); + ACE_OS::strcat (temp, ACE::basename (filename, ACE_DIRECTORY_SEPARATOR_CHAR)); - ACE_OS_String::strcat (temp, ACE_LOG_FILE_EXT_NAME); + ACE_OS::strcat (temp, ACE_LOG_FILE_EXT_NAME); #if defined (VXWORKS) // This is the only way I could figure out to avoid a console diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp index db29e15efe0..c66fe3f85be 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp @@ -99,11 +99,11 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) // This could be done with ACE_OS::sprintf() but it requires different // format strings for wide-char POSIX vs. narrow-char POSIX and Windows. // Easier to keep straight like this. - ACE_OS_String::strcpy (temp, test_dir); - ACE_OS_String::strcat (temp, ACE_LOG_DIRECTORY); - ACE_OS_String::strcat + ACE_OS::strcpy (temp, test_dir); + ACE_OS::strcat (temp, ACE_LOG_DIRECTORY); + ACE_OS::strcat (temp, ACE::basename (filename, ACE_DIRECTORY_SEPARATOR_CHAR)); - ACE_OS_String::strcat (temp, ACE_LOG_FILE_EXT_NAME); + ACE_OS::strcat (temp, ACE_LOG_FILE_EXT_NAME); #if defined (VXWORKS) // This is the only way I could figure out to avoid a console diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp index db29e15efe0..c66fe3f85be 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp @@ -99,11 +99,11 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) // This could be done with ACE_OS::sprintf() but it requires different // format strings for wide-char POSIX vs. narrow-char POSIX and Windows. // Easier to keep straight like this. - ACE_OS_String::strcpy (temp, test_dir); - ACE_OS_String::strcat (temp, ACE_LOG_DIRECTORY); - ACE_OS_String::strcat + ACE_OS::strcpy (temp, test_dir); + ACE_OS::strcat (temp, ACE_LOG_DIRECTORY); + ACE_OS::strcat (temp, ACE::basename (filename, ACE_DIRECTORY_SEPARATOR_CHAR)); - ACE_OS_String::strcat (temp, ACE_LOG_FILE_EXT_NAME); + ACE_OS::strcat (temp, ACE_LOG_FILE_EXT_NAME); #if defined (VXWORKS) // This is the only way I could figure out to avoid a console diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp index 0e4eb8d529d..7c80f15b44c 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp @@ -10,7 +10,7 @@ #include "DllOrb.h" -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x730) +#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) # pragma option push -w-8057 #endif @@ -231,6 +231,6 @@ ACE_TMAIN(int, ACE_TCHAR **argv) return 0; } -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x730) +#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) # pragma option pop #endif diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp index 25e3c395d76..ace666a3009 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp @@ -263,15 +263,6 @@ namespace TAO switch (kind) { - case CORBA::tk_longlong: - { - CORBA::LongLong tmp = ACE_CDR_LONGLONG_INITIALIZER; - ACE_NEW_RETURN (retval, - TAO::Any_Basic_Impl (tc, &tmp), - 0); - } - - break; case CORBA::tk_longdouble: { CORBA::LongDouble tmp = ACE_CDR_LONG_DOUBLE_INITIALIZER; diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h index 87a5462f93e..a0ea7524462 100644 --- a/TAO/tao/CDR.h +++ b/TAO/tao/CDR.h @@ -404,10 +404,14 @@ public: TAO_ORB_Core* orb_core = 0); /// Initialize the contents of one CDR from another, without data - /// copying and with minimimum locking overhead. + /// copying and with minimum locking overhead. TAO_InputCDR (ACE_InputCDR::Transfer_Contents rhs, TAO_ORB_Core* orb_core = 0); +#if defined (ACE_HAS_CPP11) + TAO_InputCDR& operator= (const TAO_InputCDR& rhs) = default; +#endif /* ACE_HAS_CPP11 */ + /// Destructor virtual ~TAO_InputCDR (void); diff --git a/TAO/tao/Connection_Purging_Strategy.h b/TAO/tao/Connection_Purging_Strategy.h index 7cf597bf0f7..dc790a99e80 100644 --- a/TAO/tao/Connection_Purging_Strategy.h +++ b/TAO/tao/Connection_Purging_Strategy.h @@ -35,7 +35,6 @@ class TAO_Transport; * This class is used by the Transport_Cache_Manager to maintain * ordering information on each Transport that is created. */ - class TAO_Export TAO_Connection_Purging_Strategy { public: @@ -52,7 +51,7 @@ public: virtual void update_item (TAO_Transport& transport) = 0; private: - /// The maximum number of cach entries + /// The maximum number of cache entries int cache_maximum_; }; diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp index 75cc21133e9..355b3190fb8 100644 --- a/TAO/tao/GIOP_Message_Base.cpp +++ b/TAO/tao/GIOP_Message_Base.cpp @@ -1411,7 +1411,6 @@ TAO_GIOP_Message_Base::get_parser ( // errors in the case of "clean shutdown", because it relies on // orderly disconnect as provided by TCP. This quality of service is // required to write robust distributed systems.) - void TAO_GIOP_Message_Base:: send_close_connection (const TAO_GIOP_Message_Version &version, @@ -1440,7 +1439,6 @@ TAO_GIOP_Message_Base:: // // @@ should recv and discard queued data for portability; note // that this won't block (long) since we never set SO_LINGER - if (TAO_debug_level > 9) { this->dump_msg ("send_close_connection", @@ -1474,7 +1472,6 @@ TAO_GIOP_Message_Base:: transport-> id ())); } - int TAO_GIOP_Message_Base::send_reply_exception ( TAO_Transport *transport, @@ -1643,7 +1640,6 @@ TAO_GIOP_Message_Base::is_ready_for_bidirectional (TAO_OutputCDR &msg) const return generator_parser->is_ready_for_bidirectional (); } - TAO_Queued_Data * TAO_GIOP_Message_Base::make_queued_data (size_t sz) { @@ -1947,7 +1943,6 @@ TAO_GIOP_Message_Base::consolidate_fragmented_message ( return 0; } - int TAO_GIOP_Message_Base::discard_fragmented_message (const TAO_Queued_Data *cancel_request) { diff --git a/TAO/tao/Invocation_Retry_Params.cpp b/TAO/tao/Invocation_Retry_Params.cpp index 382c03cef33..48519b3ea0f 100644 --- a/TAO/tao/Invocation_Retry_Params.cpp +++ b/TAO/tao/Invocation_Retry_Params.cpp @@ -8,10 +8,10 @@ TAO::Invocation_Retry_Params::Invocation_Retry_Params (void) : forward_on_reply_closed_limit_ (0) , init_retry_delay_ (0, 100000) // Set default to 0.1 seconds { - this->forward_on_exception_limit_[FOE_OBJECT_NOT_EXIST] = 0; - this->forward_on_exception_limit_[FOE_COMM_FAILURE] = 0; - this->forward_on_exception_limit_[FOE_TRANSIENT] = 0; - this->forward_on_exception_limit_[FOE_INV_OBJREF] = 0; + this->forward_on_exception_limit_[FOE_OBJECT_NOT_EXIST] = 0; + this->forward_on_exception_limit_[FOE_COMM_FAILURE] = 0; + this->forward_on_exception_limit_[FOE_TRANSIENT] = 0; + this->forward_on_exception_limit_[FOE_INV_OBJREF] = 0; } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Invocation_Retry_State.cpp b/TAO/tao/Invocation_Retry_State.cpp index 9ca1994e8b7..4c62c4e9d80 100644 --- a/TAO/tao/Invocation_Retry_State.cpp +++ b/TAO/tao/Invocation_Retry_State.cpp @@ -51,7 +51,6 @@ namespace client_factory_params.forward_on_reply_closed_limit_; // Forward on exception limits - retry_limit_calc (TAO::FOE_OBJECT_NOT_EXIST, command_line_params, client_factory_params, @@ -73,7 +72,6 @@ namespace result); } - } TAO::Invocation_Retry_State::Invocation_Retry_State (TAO_Stub &stub) @@ -175,5 +173,4 @@ TAO::Invocation_Retry_State::sleep () const ACE_OS::sleep (this->retry_params_.init_retry_delay_); } - TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Invocation_Retry_State.h b/TAO/tao/Invocation_Retry_State.h index 49ba8dc3db7..ffb26c0d0cc 100644 --- a/TAO/tao/Invocation_Retry_State.h +++ b/TAO/tao/Invocation_Retry_State.h @@ -23,7 +23,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - /** * @class Invocation_Retry_State * @@ -80,14 +79,12 @@ namespace TAO void sleep () const; private: - typedef ACE_Array_Map<int, int> Ex_Count_Map; Ex_Count_Map ex_count_map_; int forward_on_reply_closed_count_; Invocation_Retry_Params retry_params_; bool forward_on_exception_limit_used_; }; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 4a828ec3c11..9b930da8c0d 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -1,5 +1,3 @@ -// "" - #include "tao/ORB.h" #include "tao/ORB_Table.h" #include "tao/Connector_Registry.h" @@ -1280,7 +1278,7 @@ CORBA::ORB_init (int &argc, ACE_TCHAR *argv[], const char *orbid) return CORBA::ORB::_duplicate (oc->orb ()); } - // Determine the service object registry this ORB will use. The choises + // Determine the service object registry this ORB will use. The choices // are: (a) the legacy (global); (b) its own, local, or (c) share somebody // else's configuration. By default use the process-wide (global) context // Use this string variable to hold the configuration identity key @@ -1310,7 +1308,7 @@ CORBA::ORB_init (int &argc, ACE_TCHAR *argv[], const char *orbid) // footprint. However, if the ORB in a DLL and the rest of that // application most likely neither cares, nor wishes to know about // them. Furthermore, if the ORB DLL gets unloaded, the static - // services it had registered globaly will no longer be accesible, + // services it had registered globally will no longer be accessible, // which will have disastrous consequences at the process // shutdown. Hence, the ACE_Service_Config_Guard ensures that for // the current thread, any references to the global @@ -1448,7 +1446,6 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj) // Now hexify the encapsulated CDR data into a string, and // return that string. - size_t const total_len = cdr.total_length (); char *cp = 0; @@ -1526,7 +1523,6 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj) // Destringify arbitrary objrefs. This method is called from // <resolve_name_service> with an IOR <multicast_to_service>. - CORBA::Object_ptr CORBA::ORB::string_to_object (const char *str) { @@ -1615,7 +1611,6 @@ CORBA::ORB::_create_policy (CORBA::PolicyType type) // // XXX there should be a simple way to reuse this code in other ORB // implementations ... - CORBA::Object_ptr CORBA::ORB::ior_string_to_object (const char *str) { @@ -1672,7 +1667,6 @@ CORBA::ORB::ior_string_to_object (const char *str) // **************************************************************** // Convert an URL style IOR in an object - CORBA::Object_ptr CORBA::ORB::url_ior_string_to_object (const char* str) { diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index 083da7de8d7..7878dbbb274 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -134,7 +134,6 @@ namespace CORBA // Typedefs for CORBA::RequestSeq, which is an argument of // send_multiple_requests_*(). - typedef TAO::unbounded_object_reference_sequence< CORBA::Request, CORBA::Request_var @@ -169,7 +168,6 @@ namespace CORBA class TAO_Export ORB { public: - class TAO_Export InvalidName : public CORBA::UserException { public: @@ -537,7 +535,6 @@ namespace CORBA ACE_Time_Value *get_timeout (void); protected: - // We must be created via the @c CORBA::ORB_init() function. ORB (TAO_ORB_Core *orb_core); @@ -555,7 +552,6 @@ namespace CORBA CORBA::Object_ptr resolve_policy_current (void); private: - /// Resolve the given service based on the service ID. /** * "@c resolve_service" is a legacy name. This method now simply @@ -578,7 +574,6 @@ namespace CORBA void set_timeout (ACE_Time_Value * timeout); private: - /// Maintains a reference count of number of instantiations of the /// ORB. #if defined (ACE_HAS_CPP11) @@ -603,7 +598,6 @@ namespace CORBA }; } // End namespace CORBA - TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) diff --git a/TAO/tao/Special_Basic_Argument_T.h b/TAO/tao/Special_Basic_Argument_T.h index 879fb29db75..03f6ac34ec2 100644 --- a/TAO/tao/Special_Basic_Argument_T.h +++ b/TAO/tao/Special_Basic_Argument_T.h @@ -20,7 +20,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO @@ -54,7 +53,6 @@ namespace TAO * @class In_Special_Basic_Clonable_Argument_T * * @brief Template class for IN stub argument of (w)char/boolean/octet. - * */ template<typename S, typename to_S, @@ -77,7 +75,6 @@ namespace TAO * @class Inout_Special_Basic_Argument_T * * @brief Template class for INOUT stub argument of (w)char/boolean/octet. - * */ template<typename S, typename to_S, @@ -103,7 +100,6 @@ namespace TAO * @class Out_Special_Basic_Argument_T * * @brief Template class for OUT stub argument of (w)char/boolean/octet. - * */ template<typename S, typename to_S, @@ -128,7 +124,6 @@ namespace TAO * @class Ret_Basic_Argument_T * * @brief Template class for return stub value of (w)char/boolean/octet. - * */ template<typename S, typename to_S, @@ -164,7 +159,6 @@ namespace TAO * @struct Special_Basic_Arg_Traits_T * * @brief Template class for stub argument traits of (w)char/boolean/octet. - * */ template<typename T, typename to_T, diff --git a/TAO/tao/Storable_Base.h b/TAO/tao/Storable_Base.h index 14f4f2af7f1..5a07734f47f 100644 --- a/TAO/tao/Storable_Base.h +++ b/TAO/tao/Storable_Base.h @@ -27,11 +27,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - class TAO_Export Storable_Base { public: - Storable_Base (bool use_backup, bool retry_ebadf); virtual ~Storable_Base (); @@ -42,8 +40,8 @@ namespace TAO /// The initial value for the default is false. static bool use_backup_default; - /// The process-wide default policy for retring certain flock operations - /// if an ebadf is returned. This can happen spurously on nfs mounted + /// The process-wide default policy for retiring certain flock operations + /// if an ebadf is returned. This can happen spuriously on nfs mounted /// file. static bool retry_on_ebadf_default; @@ -121,7 +119,6 @@ namespace TAO virtual int restore_backup () = 0; protected: - virtual void do_remove () = 0; /// If a backup file exists, remove it. @@ -132,7 +129,6 @@ namespace TAO private: Storable_State state_; - }; /// Base class for exceptions thrown when encountering @@ -177,7 +173,6 @@ namespace TAO private: TAO::Storable_Base::Storable_State storable_state_; }; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Storable_Factory.h b/TAO/tao/Storable_Factory.h index 59b8f568efe..dd787fb01e2 100644 --- a/TAO/tao/Storable_Factory.h +++ b/TAO/tao/Storable_Factory.h @@ -26,7 +26,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - class TAO_Export Storable_Factory { public: @@ -41,7 +40,6 @@ namespace TAO bool use_backup = Storable_Base::use_backup_default) = 0; }; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Storable_File_Guard.h b/TAO/tao/Storable_File_Guard.h index 8642d10c007..3bf33299bc1 100644 --- a/TAO/tao/Storable_File_Guard.h +++ b/TAO/tao/Storable_File_Guard.h @@ -18,7 +18,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - /** * @class Storable_File_Guard * @brief Base class to use with TAO_Storable_Base to synch object state @@ -32,7 +31,6 @@ namespace TAO class TAO_Export Storable_File_Guard { public: - Storable_File_Guard (bool redundant, bool use_backup = Storable_Base::use_backup_default); @@ -69,7 +67,6 @@ namespace TAO }; protected: - /// Should be called by constructors of derived classes /// since can't call the virtual functions below in constructor /// of this class. @@ -106,8 +103,7 @@ namespace TAO Storable_Base *fl_; private: - - // Return 0 if succesful. + // Return 0 if successful. int load (); bool redundant_; @@ -123,9 +119,7 @@ namespace TAO /// Symbolic values for the flags in the above enum { mode_write = 1, mode_read = 2, mode_create = 4 }; - }; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Storable_FlatFileStream.h b/TAO/tao/Storable_FlatFileStream.h index bfa0b2b39c0..9083f558ffc 100644 --- a/TAO/tao/Storable_FlatFileStream.h +++ b/TAO/tao/Storable_FlatFileStream.h @@ -27,10 +27,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - /** * @brief A Storable_Base derived class that works with a file stream. - * */ class TAO_Export Storable_FlatFileStream : public Storable_Base { @@ -93,7 +91,6 @@ namespace TAO virtual int restore_backup (); protected: - virtual void do_remove (); virtual void remove_backup (); @@ -101,7 +98,6 @@ namespace TAO virtual int create_backup (); private: - /// Throw a Storable_Read_Exception if the state /// is not good due to a read error. void throw_on_read_error (Storable_State state); @@ -121,7 +117,6 @@ namespace TAO class TAO_Export Storable_FlatFileFactory : public Storable_Factory { public: - /// @param directory Directory to contain file passed in /// create_stream (). The directory is assumed to already exist. Storable_FlatFileFactory(const ACE_CString & directory, @@ -136,7 +131,7 @@ namespace TAO // Factory Methods - /// Create the stream that can operate on a disk file + /// Create the stream that can operate on a disk file virtual Storable_Base *create_stream (const ACE_CString & file, const char * mode, bool = false); diff --git a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h index facc7698ed5..89546535b21 100644 --- a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h +++ b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h @@ -33,7 +33,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * transport has a larger ordering number than the previous. This will * cause the first transport to be purged first. */ - class TAO_Strategies_Export TAO_FIFO_Connection_Purging_Strategy: public TAO_Connection_Purging_Strategy { diff --git a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h index b99b6ae997b..93c55d33a94 100644 --- a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h +++ b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h @@ -32,7 +32,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * in. This way, the least frequently used transport has the * smallest ordering number and will therefore be purged first. */ - class TAO_Strategies_Export TAO_LFU_Connection_Purging_Strategy: public TAO_Connection_Purging_Strategy { diff --git a/TAO/tao/String_Manager_T.h b/TAO/tao/String_Manager_T.h index 70810112925..2a596187c52 100644 --- a/TAO/tao/String_Manager_T.h +++ b/TAO/tao/String_Manager_T.h @@ -133,13 +133,11 @@ private: typedef TAO::String_Manager_T<CORBA::WChar> WString_Manager; } - inline bool operator< (const TAO::String_Manager &lhs, const TAO::String_Manager &rhs) { return ACE_OS::strcmp (lhs.in(), rhs.in ()) < 0; } - inline bool operator< (const TAO::WString_Manager &lhs, const TAO::WString_Manager &rhs) { return ACE_OS::strcmp (lhs.in(), rhs.in ()) < 0; diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp index 4b7563ec7a6..6e1c38b22e9 100644 --- a/TAO/tao/Synch_Invocation.cpp +++ b/TAO/tao/Synch_Invocation.cpp @@ -35,32 +35,27 @@ namespace int excep_for_type (const char *tid) { - if (ACE_OS_String::strcmp (tid, "IDL:omg.org/CORBA/TRANSIENT:1.0") == 0) + if (ACE_OS::strcmp (tid, "IDL:omg.org/CORBA/TRANSIENT:1.0") == 0) { return TAO::FOE_TRANSIENT; } - else if (ACE_OS_String::strcmp (tid, - "IDL:omg.org/CORBA/COMM_FAILURE:1.0") == 0) + else if (ACE_OS::strcmp (tid, "IDL:omg.org/CORBA/COMM_FAILURE:1.0") == 0) { return TAO::FOE_COMM_FAILURE; } - else if (ACE_OS_String::strcmp (tid, - "IDL:omg.org/CORBA/OBJECT_NOT_EXIST:1.0") == 0) + else if (ACE_OS::strcmp (tid, "IDL:omg.org/CORBA/OBJECT_NOT_EXIST:1.0") == 0) { return TAO::FOE_OBJECT_NOT_EXIST; } - else if (ACE_OS_String::strcmp (tid, - "IDL:omg.org/CORBA/INV_OBJREF:1.0") == 0) + else if (ACE_OS::strcmp (tid, "IDL:omg.org/CORBA/INV_OBJREF:1.0") == 0) { return TAO::FOE_INV_OBJREF; } - else if (ACE_OS_String::strcmp (tid, - "IDL:omg.org/CORBA/OBJ_ADAPTER:1.0") == 0) + else if (ACE_OS::strcmp (tid, "IDL:omg.org/CORBA/OBJ_ADAPTER:1.0") == 0) { return TAO::FOE_OBJ_ADAPTER; } - else if (ACE_OS_String::strcmp (tid, - "IDL:omg.org/CORBA/NO_RESPONSE:1.0") == 0) + else if (ACE_OS::strcmp (tid, "IDL:omg.org/CORBA/NO_RESPONSE:1.0") == 0) { return TAO::FOE_NO_RESPONSE; } @@ -640,8 +635,8 @@ namespace TAO } else { - int foe_kind = orb_params->forward_once_exception(); - int ex_id = excep_for_type (type_id.in ()); + int const foe_kind = orb_params->forward_once_exception(); + int const ex_id = excep_for_type (type_id.in ()); // this logic is a little confusing but prior to Jul 24 2009, TRANSIENT, // OBJ_ADAPTER, NO_RESPONSE, and COMM_FAILURE were always retried if possible. diff --git a/TAO/tao/Transport_Cache_Manager_T.cpp b/TAO/tao/Transport_Cache_Manager_T.cpp index 0dab65921c7..868bd41cd97 100644 --- a/TAO/tao/Transport_Cache_Manager_T.cpp +++ b/TAO/tao/Transport_Cache_Manager_T.cpp @@ -18,7 +18,6 @@ // TAO_debug_level > 6: detailed cache operations (LM_DEBUG) // TAO_debug_level > 8: for debugging the cache itself (LM_DEBUG) - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO @@ -306,7 +305,7 @@ namespace TAO { TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager_T::find_i, ") - ACE_TEXT ("Found available Transport[%d] @hash:index {%d:%d}\n"), + ACE_TEXT ("found available Transport[%d] @hash:index {%d:%d}\n"), entry->item ().transport ()->id (), entry->ext_id_.hash (), entry->ext_id_.index () @@ -319,7 +318,7 @@ namespace TAO { TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager_T::find_i, ") - ACE_TEXT ("Found connecting Transport[%d] @hash:index {%d:%d}\n"), + ACE_TEXT ("found connecting Transport[%d] @hash:index {%d:%d}\n"), entry->item ().transport ()->id (), entry->ext_id_.hash (), entry->ext_id_.index () @@ -345,7 +344,7 @@ namespace TAO { TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager_T::find_i, ") - ACE_TEXT ("Found busy Transport[%d] @hash:index {%d:%d}\n"), + ACE_TEXT ("found busy Transport[%d] @hash:index {%d:%d}\n"), entry->item ().transport ()->id (), entry->ext_id_.hash (), entry->ext_id_.index () @@ -453,7 +452,7 @@ namespace TAO Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::purge_entry_i (HASH_MAP_ENTRY *entry) { // Remove the entry from the Map - int retval = this->cache_map_.unbind (entry); + int const retval = this->cache_map_.unbind (entry); #if defined (TAO_HAS_MONITOR_POINTS) && (TAO_HAS_MONITOR_POINTS == 1) this->size_monitor_->receive (this->current_size ()); @@ -492,11 +491,11 @@ namespace TAO bool Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::is_entry_purgable_i (HASH_MAP_ENTRY &entry) { - Cache_Entries_State entry_state = entry.int_id_.recycle_state (); + Cache_Entries_State const entry_state = entry.int_id_.recycle_state (); transport_type* transport = entry.int_id_.transport (); - bool result = (entry_state == ENTRY_IDLE_AND_PURGABLE || - entry_state == ENTRY_PURGABLE_BUT_NOT_IDLE) - && transport->can_be_purged (); + bool const result = (entry_state == ENTRY_IDLE_AND_PURGABLE || + entry_state == ENTRY_PURGABLE_BUT_NOT_IDLE) + && transport->can_be_purged (); if (TAO_debug_level > 8) { diff --git a/TAO/tao/Transport_Cache_Manager_T.h b/TAO/tao/Transport_Cache_Manager_T.h index 3b6920ef04f..a61759c9398 100644 --- a/TAO/tao/Transport_Cache_Manager_T.h +++ b/TAO/tao/Transport_Cache_Manager_T.h @@ -54,7 +54,6 @@ namespace TAO * map is updated only by holding the lock. The more compeling reason * to have the lock in this class and not in the Hash_Map is that, we * do quite a bit of work in this class for which we need a lock. - * */ template <typename TT, typename TRDT, typename PSTRAT> class Transport_Cache_Manager_T diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp index 236d726d792..c1e11a1484c 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp @@ -1555,7 +1555,7 @@ TAO_TypeCodeFactory_i::unique_label_values ( CORBA::ULong enum_val; CORBA::ULongLong ulonglong_val; CORBA::LongLong longlong_val; - } s = {0, 0, 0, 0, 0, 0, 0, 0, ACE_CDR_LONGLONG_INITIALIZER }; + } s = {0, 0, 0, 0, 0, 0, 0, 0, 0 }; // Two cases - one for signed and one for unsigned discriminator types. if (disc_kind == CORBA::tk_long diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h index 6d5a6f629c5..acc29c703af 100644 --- a/TAO/tao/Version.h +++ b/TAO/tao/Version.h @@ -4,9 +4,9 @@ #define TAO_MAJOR_VERSION 2 #define TAO_MINOR_VERSION 5 -#define TAO_MICRO_VERSION 8 -#define TAO_BETA_VERSION 8 -#define TAO_VERSION "2.5.8" -#define TAO_VERSION_CODE 132360 +#define TAO_MICRO_VERSION 9 +#define TAO_BETA_VERSION 9 +#define TAO_VERSION "2.5.9" +#define TAO_VERSION_CODE 132361 #define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c)) diff --git a/TAO/tao/params.h b/TAO/tao/params.h index 59e548e0b3a..891e828d415 100644 --- a/TAO/tao/params.h +++ b/TAO/tao/params.h @@ -42,8 +42,6 @@ typedef ACE_Unbounded_Queue_Const_Iterator<ACE_CString> TAO_EndpointSetIterator; // ------------------------------------------------------------------- - - /** * @class TAO_ORB_Parameters * diff --git a/TAO/tests/AMH_Exceptions/.gitignore b/TAO/tests/AMH_Exceptions/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/AMH_Exceptions/.gitignore +++ b/TAO/tests/AMH_Exceptions/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/AMH_Oneway/.gitignore b/TAO/tests/AMH_Oneway/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/AMH_Oneway/.gitignore +++ b/TAO/tests/AMH_Oneway/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/AMI/.gitignore b/TAO/tests/AMI/.gitignore index e5c224e681b..c035a20d74a 100644 --- a/TAO/tests/AMI/.gitignore +++ b/TAO/tests/AMI/.gitignore @@ -1,3 +1,8 @@ +/ami_testC.cpp +/ami_testC.h +/ami_testC.inl +/ami_testS.cpp +/ami_testS.h /client /server /simple_client diff --git a/TAO/tests/AMI_Buffering/.gitignore b/TAO/tests/AMI_Buffering/.gitignore index 7448aa230b1..bbd643e7adf 100644 --- a/TAO/tests/AMI_Buffering/.gitignore +++ b/TAO/tests/AMI_Buffering/.gitignore @@ -1,3 +1,8 @@ /admin /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/AMI_Timeouts/.gitignore b/TAO/tests/AMI_Timeouts/.gitignore index 3d33a15f751..384b51c6963 100644 --- a/TAO/tests/AMI_Timeouts/.gitignore +++ b/TAO/tests/AMI_Timeouts/.gitignore @@ -1,2 +1,7 @@ /client /server +/timeoutC.cpp +/timeoutC.h +/timeoutC.inl +/timeoutS.cpp +/timeoutS.h diff --git a/TAO/tests/Abstract_Interface/.gitignore b/TAO/tests/Abstract_Interface/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/Abstract_Interface/.gitignore +++ b/TAO/tests/Abstract_Interface/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Alt_Mapping/.gitignore b/TAO/tests/Alt_Mapping/.gitignore new file mode 100644 index 00000000000..c3e7c9f3fb6 --- /dev/null +++ b/TAO/tests/Alt_Mapping/.gitignore @@ -0,0 +1,7 @@ +/alt_mappingC.cpp +/alt_mappingC.h +/alt_mappingC.inl +/alt_mappingS.cpp +/alt_mappingS.h +/client +/server diff --git a/TAO/tests/Any/Indirected/.gitignore b/TAO/tests/Any/Indirected/.gitignore new file mode 100644 index 00000000000..09b6defb2a9 --- /dev/null +++ b/TAO/tests/Any/Indirected/.gitignore @@ -0,0 +1,6 @@ +/client +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Any/Recursive/.gitignore b/TAO/tests/Any/Recursive/.gitignore index 3d33a15f751..03d6a07792b 100644 --- a/TAO/tests/Any/Recursive/.gitignore +++ b/TAO/tests/Any/Recursive/.gitignore @@ -1,2 +1,12 @@ /client +/NonRecursiveC.cpp +/NonRecursiveC.h +/NonRecursiveC.inl +/NonRecursiveS.cpp +/NonRecursiveS.h /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/BiDirectional/.gitignore b/TAO/tests/BiDirectional/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/BiDirectional/.gitignore +++ b/TAO/tests/BiDirectional/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/BiDirectional_DelayedUpcall/.gitignore b/TAO/tests/BiDirectional_DelayedUpcall/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/BiDirectional_DelayedUpcall/.gitignore +++ b/TAO/tests/BiDirectional_DelayedUpcall/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/BiDirectional_NestedUpcall/.gitignore b/TAO/tests/BiDirectional_NestedUpcall/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/.gitignore +++ b/TAO/tests/BiDirectional_NestedUpcall/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Big_AMI/.gitignore b/TAO/tests/Big_AMI/.gitignore index 3d33a15f751..142d0c032f0 100644 --- a/TAO/tests/Big_AMI/.gitignore +++ b/TAO/tests/Big_AMI/.gitignore @@ -1,2 +1,7 @@ +/ami_testC.cpp +/ami_testC.h +/ami_testC.inl +/ami_testS.cpp +/ami_testS.h /client /server diff --git a/TAO/tests/Big_Oneways/.gitignore b/TAO/tests/Big_Oneways/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Big_Oneways/.gitignore +++ b/TAO/tests/Big_Oneways/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Big_Reply/.gitignore b/TAO/tests/Big_Reply/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Big_Reply/.gitignore +++ b/TAO/tests/Big_Reply/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Big_Request_Muxing/.gitignore b/TAO/tests/Big_Request_Muxing/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Big_Request_Muxing/.gitignore +++ b/TAO/tests/Big_Request_Muxing/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Big_Twoways/.gitignore b/TAO/tests/Big_Twoways/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Big_Twoways/.gitignore +++ b/TAO/tests/Big_Twoways/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Big_Twoways/README b/TAO/tests/Big_Twoways/README index 3de1a42ef28..7787ce966e0 100644 --- a/TAO/tests/Big_Twoways/README +++ b/TAO/tests/Big_Twoways/README @@ -1,23 +1,21 @@ /** - - @page Big_Oneways Test README File - This is a stress test for the non-blocking I/O features in the +This is a stress test for the non-blocking I/O features in the ORB. The test connects multiple peer processes together. Each process sends messages to all its peers, using multiple threads to generate the messages. Without non-blocking I/O the system soon deadlocks. - This is part of the regression testsuite for: +This is part of the regression testsuite for: http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=132 - To run the test use the run_test.pl script: +To run the test use the run_test.pl script: $ ./run_test.pl - the script returns 0 if the test was successful. +the script returns 0 if the test was successful. */ diff --git a/TAO/tests/Blocking_Sync_None/.gitignore b/TAO/tests/Blocking_Sync_None/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Blocking_Sync_None/.gitignore +++ b/TAO/tests/Blocking_Sync_None/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_1020_Basic_Regression/.gitignore b/TAO/tests/Bug_1020_Basic_Regression/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/.gitignore +++ b/TAO/tests/Bug_1020_Basic_Regression/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_1020_Regression/.gitignore b/TAO/tests/Bug_1020_Regression/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Bug_1020_Regression/.gitignore +++ b/TAO/tests/Bug_1020_Regression/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_1254_Regression/.gitignore b/TAO/tests/Bug_1254_Regression/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/Bug_1254_Regression/.gitignore +++ b/TAO/tests/Bug_1254_Regression/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Bug_1269_Regression/.gitignore b/TAO/tests/Bug_1269_Regression/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Bug_1269_Regression/.gitignore +++ b/TAO/tests/Bug_1269_Regression/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_1270_Regression/.gitignore b/TAO/tests/Bug_1270_Regression/.gitignore index 00558ecb6e8..5ffbccd7278 100644 --- a/TAO/tests/Bug_1270_Regression/.gitignore +++ b/TAO/tests/Bug_1270_Regression/.gitignore @@ -1,3 +1,8 @@ /client /server /shutdown +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_1330_Regression/.gitignore b/TAO/tests/Bug_1330_Regression/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Bug_1330_Regression/.gitignore +++ b/TAO/tests/Bug_1330_Regression/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_1361_Regression/.gitignore b/TAO/tests/Bug_1361_Regression/.gitignore index 00558ecb6e8..5ffbccd7278 100644 --- a/TAO/tests/Bug_1361_Regression/.gitignore +++ b/TAO/tests/Bug_1361_Regression/.gitignore @@ -1,3 +1,8 @@ /client /server /shutdown +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_1383_Regression/.gitignore b/TAO/tests/Bug_1383_Regression/.gitignore new file mode 100644 index 00000000000..2431ed90dae --- /dev/null +++ b/TAO/tests/Bug_1383_Regression/.gitignore @@ -0,0 +1,12 @@ +/calleeC.cpp +/calleeC.h +/calleeC.inl +/calleeS.cpp +/calleeS.h +/client +/server +/simpleC.cpp +/simpleC.h +/simpleC.inl +/simpleS.cpp +/simpleS.h diff --git a/TAO/tests/Bug_1476_Regression/.gitignore b/TAO/tests/Bug_1476_Regression/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Bug_1476_Regression/.gitignore +++ b/TAO/tests/Bug_1476_Regression/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_1476_Test/.gitignore b/TAO/tests/Bug_1476_Test/.gitignore index 7149778f20e..1e1cd2072ef 100644 --- a/TAO/tests/Bug_1476_Test/.gitignore +++ b/TAO/tests/Bug_1476_Test/.gitignore @@ -1 +1,6 @@ /client +/HelloC.cpp +/HelloC.h +/HelloC.inl +/HelloS.cpp +/HelloS.h diff --git a/TAO/tests/Bug_1482_Regression/.gitignore b/TAO/tests/Bug_1482_Regression/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Bug_1482_Regression/.gitignore +++ b/TAO/tests/Bug_1482_Regression/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_1495_Regression/.gitignore b/TAO/tests/Bug_1495_Regression/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/Bug_1495_Regression/.gitignore +++ b/TAO/tests/Bug_1495_Regression/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Bug_1495_Regression/server_interceptor.cpp b/TAO/tests/Bug_1495_Regression/server_interceptor.cpp index 72224e5d069..001a894e0b4 100644 --- a/TAO/tests/Bug_1495_Regression/server_interceptor.cpp +++ b/TAO/tests/Bug_1495_Regression/server_interceptor.cpp @@ -61,8 +61,8 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( // locally on the server side as a side effect of another call, // meaning that the client hasn't added the service context yet. // Same goes for the shutdown call - if (ACE_OS_String::strcmp ("_is_a", operation.in ()) == 0 || - ACE_OS_String::strcmp ("shutdown", operation.in ()) == 0) + if (ACE_OS::strcmp ("_is_a", operation.in ()) == 0 || + ACE_OS::strcmp ("shutdown", operation.in ()) == 0) return; forward_location_done_ = true; diff --git a/TAO/tests/Bug_1535_Regression/.gitignore b/TAO/tests/Bug_1535_Regression/.gitignore index 3abba296b3f..c9de7f863b9 100644 --- a/TAO/tests/Bug_1535_Regression/.gitignore +++ b/TAO/tests/Bug_1535_Regression/.gitignore @@ -1 +1,6 @@ /bug_1535_regression +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_1551_Regression/.gitignore b/TAO/tests/Bug_1551_Regression/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Bug_1551_Regression/.gitignore +++ b/TAO/tests/Bug_1551_Regression/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_1568_Regression/.gitignore b/TAO/tests/Bug_1568_Regression/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Bug_1568_Regression/.gitignore +++ b/TAO/tests/Bug_1568_Regression/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_1627_Regression/.gitignore b/TAO/tests/Bug_1627_Regression/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Bug_1627_Regression/.gitignore +++ b/TAO/tests/Bug_1627_Regression/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_1636_Regression/.gitignore b/TAO/tests/Bug_1636_Regression/.gitignore index 7149778f20e..09b6defb2a9 100644 --- a/TAO/tests/Bug_1636_Regression/.gitignore +++ b/TAO/tests/Bug_1636_Regression/.gitignore @@ -1 +1,6 @@ /client +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Bug_1639_Regression/.gitignore b/TAO/tests/Bug_1639_Regression/.gitignore index 7149778f20e..dee12347b1d 100644 --- a/TAO/tests/Bug_1639_Regression/.gitignore +++ b/TAO/tests/Bug_1639_Regression/.gitignore @@ -1 +1,6 @@ /client +/structC.cpp +/structC.h +/structC.inl +/structS.cpp +/structS.h diff --git a/TAO/tests/Bug_1670_Regression/.gitignore b/TAO/tests/Bug_1670_Regression/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Bug_1670_Regression/.gitignore +++ b/TAO/tests/Bug_1670_Regression/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_1676_Regression/.gitignore b/TAO/tests/Bug_1676_Regression/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Bug_1676_Regression/.gitignore +++ b/TAO/tests/Bug_1676_Regression/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_1693_Test/.gitignore b/TAO/tests/Bug_1693_Test/.gitignore index 7149778f20e..09b6defb2a9 100644 --- a/TAO/tests/Bug_1693_Test/.gitignore +++ b/TAO/tests/Bug_1693_Test/.gitignore @@ -1 +1,6 @@ /client +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Bug_1812_Regression/.gitignore b/TAO/tests/Bug_1812_Regression/.gitignore index 06845b19f52..41f66e96d8f 100644 --- a/TAO/tests/Bug_1812_Regression/.gitignore +++ b/TAO/tests/Bug_1812_Regression/.gitignore @@ -1 +1,6 @@ /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_1813_Regression/.gitignore b/TAO/tests/Bug_1813_Regression/.gitignore index 06845b19f52..41f66e96d8f 100644 --- a/TAO/tests/Bug_1813_Regression/.gitignore +++ b/TAO/tests/Bug_1813_Regression/.gitignore @@ -1 +1,6 @@ /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_1869_Regression/.gitignore b/TAO/tests/Bug_1869_Regression/.gitignore index 3d33a15f751..48e103d08ce 100644 --- a/TAO/tests/Bug_1869_Regression/.gitignore +++ b/TAO/tests/Bug_1869_Regression/.gitignore @@ -1,2 +1,7 @@ +/AMIC.cpp +/AMIC.h +/AMIC.inl +/AMIS.cpp +/AMIS.h /client /server diff --git a/TAO/tests/Bug_1904_Regression/.gitignore b/TAO/tests/Bug_1904_Regression/.gitignore index ee4c9268234..319aaae0698 100644 --- a/TAO/tests/Bug_1904_Regression/.gitignore +++ b/TAO/tests/Bug_1904_Regression/.gitignore @@ -1 +1,6 @@ /test +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Bug_2084_Regression/.gitignore b/TAO/tests/Bug_2084_Regression/.gitignore index 06845b19f52..41f66e96d8f 100644 --- a/TAO/tests/Bug_2084_Regression/.gitignore +++ b/TAO/tests/Bug_2084_Regression/.gitignore @@ -1 +1,6 @@ /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_2085_Regression/.gitignore b/TAO/tests/Bug_2085_Regression/.gitignore new file mode 100644 index 00000000000..7149778f20e --- /dev/null +++ b/TAO/tests/Bug_2085_Regression/.gitignore @@ -0,0 +1 @@ +/client diff --git a/TAO/tests/Bug_2119_Regression/.gitignore b/TAO/tests/Bug_2119_Regression/.gitignore new file mode 100644 index 00000000000..e1555c28d5a --- /dev/null +++ b/TAO/tests/Bug_2119_Regression/.gitignore @@ -0,0 +1,5 @@ +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Bug_2122_Regression/.gitignore b/TAO/tests/Bug_2122_Regression/.gitignore index 7149778f20e..2eef27fee30 100644 --- a/TAO/tests/Bug_2122_Regression/.gitignore +++ b/TAO/tests/Bug_2122_Regression/.gitignore @@ -1 +1,6 @@ /client +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_2124_Regression/.gitignore b/TAO/tests/Bug_2124_Regression/.gitignore index 06845b19f52..41f66e96d8f 100644 --- a/TAO/tests/Bug_2124_Regression/.gitignore +++ b/TAO/tests/Bug_2124_Regression/.gitignore @@ -1 +1,6 @@ /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_2126_Regression/.gitignore b/TAO/tests/Bug_2126_Regression/.gitignore index 7149778f20e..2eef27fee30 100644 --- a/TAO/tests/Bug_2126_Regression/.gitignore +++ b/TAO/tests/Bug_2126_Regression/.gitignore @@ -1 +1,6 @@ /client +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_2134_Regression/.gitignore b/TAO/tests/Bug_2134_Regression/.gitignore index 06845b19f52..a16aa5082a3 100644 --- a/TAO/tests/Bug_2134_Regression/.gitignore +++ b/TAO/tests/Bug_2134_Regression/.gitignore @@ -1 +1,6 @@ +/HelloC.cpp +/HelloC.h +/HelloC.inl +/HelloS.cpp +/HelloS.h /server diff --git a/TAO/tests/Bug_2144_Regression/.gitignore b/TAO/tests/Bug_2144_Regression/.gitignore index ee4c9268234..319aaae0698 100644 --- a/TAO/tests/Bug_2144_Regression/.gitignore +++ b/TAO/tests/Bug_2144_Regression/.gitignore @@ -1 +1,6 @@ /test +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Bug_2174_Regression/.gitignore b/TAO/tests/Bug_2174_Regression/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/Bug_2174_Regression/.gitignore +++ b/TAO/tests/Bug_2174_Regression/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Bug_2183_Regression/.gitignore b/TAO/tests/Bug_2183_Regression/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Bug_2183_Regression/.gitignore +++ b/TAO/tests/Bug_2183_Regression/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_2186_Regression/.gitignore b/TAO/tests/Bug_2186_Regression/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Bug_2186_Regression/.gitignore +++ b/TAO/tests/Bug_2186_Regression/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_2188_Regression/.gitignore b/TAO/tests/Bug_2188_Regression/.gitignore index 3d33a15f751..186c6a964e0 100644 --- a/TAO/tests/Bug_2188_Regression/.gitignore +++ b/TAO/tests/Bug_2188_Regression/.gitignore @@ -1,2 +1,7 @@ +/brokenC.cpp +/brokenC.h +/brokenC.inl +/brokenS.cpp +/brokenS.h /client /server diff --git a/TAO/tests/Bug_2201_Regression/.gitignore b/TAO/tests/Bug_2201_Regression/.gitignore index ee4c9268234..27dca20ce0d 100644 --- a/TAO/tests/Bug_2201_Regression/.gitignore +++ b/TAO/tests/Bug_2201_Regression/.gitignore @@ -1 +1,6 @@ /test +/TestDataC.cpp +/TestDataC.h +/TestDataC.inl +/TestDataS.cpp +/TestDataS.h diff --git a/TAO/tests/Bug_2222_Regression/.gitignore b/TAO/tests/Bug_2222_Regression/.gitignore index 7149778f20e..c305a8fa777 100644 --- a/TAO/tests/Bug_2222_Regression/.gitignore +++ b/TAO/tests/Bug_2222_Regression/.gitignore @@ -1 +1,11 @@ /client +/TestCaseC.cpp +/TestCaseC.h +/TestCaseC.inl +/TestCaseS.cpp +/TestCaseS.h +/TestTypeC.cpp +/TestTypeC.h +/TestTypeC.inl +/TestTypeS.cpp +/TestTypeS.h diff --git a/TAO/tests/Bug_2234_Regression/.gitignore b/TAO/tests/Bug_2234_Regression/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Bug_2234_Regression/.gitignore +++ b/TAO/tests/Bug_2234_Regression/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_2241_Regression/.gitignore b/TAO/tests/Bug_2241_Regression/.gitignore new file mode 100644 index 00000000000..685798e618b --- /dev/null +++ b/TAO/tests/Bug_2241_Regression/.gitignore @@ -0,0 +1,6 @@ +/Bug_2241_Regression +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_2243_Regression/.gitignore b/TAO/tests/Bug_2243_Regression/.gitignore new file mode 100644 index 00000000000..728dd19616a --- /dev/null +++ b/TAO/tests/Bug_2243_Regression/.gitignore @@ -0,0 +1 @@ +/ORB_object_to_string diff --git a/TAO/tests/Bug_2289_Regression/.gitignore b/TAO/tests/Bug_2289_Regression/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Bug_2289_Regression/.gitignore +++ b/TAO/tests/Bug_2289_Regression/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_2319_Regression/.gitignore b/TAO/tests/Bug_2319_Regression/.gitignore index 06845b19f52..41f66e96d8f 100644 --- a/TAO/tests/Bug_2319_Regression/.gitignore +++ b/TAO/tests/Bug_2319_Regression/.gitignore @@ -1 +1,6 @@ /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_2328_Regression/.gitignore b/TAO/tests/Bug_2328_Regression/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Bug_2328_Regression/.gitignore +++ b/TAO/tests/Bug_2328_Regression/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_2349_Regression/.gitignore b/TAO/tests/Bug_2349_Regression/.gitignore index 3d33a15f751..9373c7083d6 100644 --- a/TAO/tests/Bug_2349_Regression/.gitignore +++ b/TAO/tests/Bug_2349_Regression/.gitignore @@ -1,2 +1,7 @@ /client +/fooC.cpp +/fooC.h +/fooC.inl +/fooS.cpp +/fooS.h /server diff --git a/TAO/tests/Bug_2356_Regression/.gitignore b/TAO/tests/Bug_2356_Regression/.gitignore new file mode 100644 index 00000000000..142d0c032f0 --- /dev/null +++ b/TAO/tests/Bug_2356_Regression/.gitignore @@ -0,0 +1,7 @@ +/ami_testC.cpp +/ami_testC.h +/ami_testC.inl +/ami_testS.cpp +/ami_testS.h +/client +/server diff --git a/TAO/tests/Bug_2375_Regression/.gitignore b/TAO/tests/Bug_2375_Regression/.gitignore index ee4c9268234..319aaae0698 100644 --- a/TAO/tests/Bug_2375_Regression/.gitignore +++ b/TAO/tests/Bug_2375_Regression/.gitignore @@ -1 +1,6 @@ /test +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Bug_2399_Regression/.gitignore b/TAO/tests/Bug_2399_Regression/.gitignore index ee4c9268234..15d32d13db0 100644 --- a/TAO/tests/Bug_2399_Regression/.gitignore +++ b/TAO/tests/Bug_2399_Regression/.gitignore @@ -1 +1,11 @@ +/includedC.cpp +/includedC.h +/includedC.inl +/includedS.cpp +/includedS.h /test +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Bug_2417_Regression/.gitignore b/TAO/tests/Bug_2417_Regression/.gitignore index 3d33a15f751..098e934648d 100644 --- a/TAO/tests/Bug_2417_Regression/.gitignore +++ b/TAO/tests/Bug_2417_Regression/.gitignore @@ -1,2 +1,12 @@ /client +/publisherC.cpp +/publisherC.h +/publisherC.inl +/publisherS.cpp +/publisherS.h /server +/subscriberC.cpp +/subscriberC.h +/subscriberC.inl +/subscriberS.cpp +/subscriberS.h diff --git a/TAO/tests/Bug_2419_Regression/.gitignore b/TAO/tests/Bug_2419_Regression/.gitignore index 7149778f20e..d224e9bf531 100644 --- a/TAO/tests/Bug_2419_Regression/.gitignore +++ b/TAO/tests/Bug_2419_Regression/.gitignore @@ -1 +1,11 @@ +/abstract_parentC.cpp +/abstract_parentC.h +/abstract_parentC.inl +/abstract_parentS.cpp +/abstract_parentS.h /client +/local_childC.cpp +/local_childC.h +/local_childC.inl +/local_childS.cpp +/local_childS.h diff --git a/TAO/tests/Bug_2424_Regression/.gitignore b/TAO/tests/Bug_2424_Regression/.gitignore index 7149778f20e..65c27e5139f 100644 --- a/TAO/tests/Bug_2424_Regression/.gitignore +++ b/TAO/tests/Bug_2424_Regression/.gitignore @@ -1 +1,6 @@ /client +/OneLineCosNamingC.cpp +/OneLineCosNamingC.h +/OneLineCosNamingC.inl +/OneLineCosNamingS.cpp +/OneLineCosNamingS.h diff --git a/TAO/tests/Bug_2429_Regression/.gitignore b/TAO/tests/Bug_2429_Regression/.gitignore index 3d33a15f751..5f5d3aaf465 100644 --- a/TAO/tests/Bug_2429_Regression/.gitignore +++ b/TAO/tests/Bug_2429_Regression/.gitignore @@ -1,2 +1,12 @@ +/ChildC.cpp +/ChildC.h +/ChildC.inl +/ChildS.cpp +/ChildS.h /client +/ParentC.cpp +/ParentC.h +/ParentC.inl +/ParentS.cpp +/ParentS.h /server diff --git a/TAO/tests/Bug_2494_Regression/.gitignore b/TAO/tests/Bug_2494_Regression/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/Bug_2494_Regression/.gitignore +++ b/TAO/tests/Bug_2494_Regression/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Bug_2503_Regression/.gitignore b/TAO/tests/Bug_2503_Regression/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Bug_2503_Regression/.gitignore +++ b/TAO/tests/Bug_2503_Regression/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_2542_Regression/.gitignore b/TAO/tests/Bug_2542_Regression/.gitignore index 7149778f20e..2eef27fee30 100644 --- a/TAO/tests/Bug_2542_Regression/.gitignore +++ b/TAO/tests/Bug_2542_Regression/.gitignore @@ -1 +1,6 @@ /client +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_2543_Regression/.gitignore b/TAO/tests/Bug_2543_Regression/.gitignore index 7149778f20e..2eef27fee30 100644 --- a/TAO/tests/Bug_2543_Regression/.gitignore +++ b/TAO/tests/Bug_2543_Regression/.gitignore @@ -1 +1,6 @@ /client +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_2549_Regression/.gitignore b/TAO/tests/Bug_2549_Regression/.gitignore index ee4c9268234..319aaae0698 100644 --- a/TAO/tests/Bug_2549_Regression/.gitignore +++ b/TAO/tests/Bug_2549_Regression/.gitignore @@ -1 +1,6 @@ /test +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Bug_2560_Regression/.gitignore b/TAO/tests/Bug_2560_Regression/.gitignore index 3d33a15f751..67f2eb6a3d9 100644 --- a/TAO/tests/Bug_2560_Regression/.gitignore +++ b/TAO/tests/Bug_2560_Regression/.gitignore @@ -1,2 +1,7 @@ /client +/QuoterC.cpp +/QuoterC.h +/QuoterC.inl +/QuoterS.cpp +/QuoterS.h /server diff --git a/TAO/tests/Bug_2593_Regression/.gitignore b/TAO/tests/Bug_2593_Regression/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Bug_2593_Regression/.gitignore +++ b/TAO/tests/Bug_2593_Regression/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_2595_Regression/.gitignore b/TAO/tests/Bug_2595_Regression/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Bug_2595_Regression/.gitignore +++ b/TAO/tests/Bug_2595_Regression/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_2654_Regression/.gitignore b/TAO/tests/Bug_2654_Regression/.gitignore index 3d33a15f751..29241572c45 100644 --- a/TAO/tests/Bug_2654_Regression/.gitignore +++ b/TAO/tests/Bug_2654_Regression/.gitignore @@ -1,2 +1,7 @@ /client +/HelloC.cpp +/HelloC.h +/HelloC.inl +/HelloS.cpp +/HelloS.h /server diff --git a/TAO/tests/Bug_2669_Regression/.gitignore b/TAO/tests/Bug_2669_Regression/.gitignore index 7149778f20e..6fe9fb8809d 100644 --- a/TAO/tests/Bug_2669_Regression/.gitignore +++ b/TAO/tests/Bug_2669_Regression/.gitignore @@ -1 +1,11 @@ +/ChildC.cpp +/ChildC.h +/ChildC.inl +/ChildS.cpp +/ChildS.h /client +/ParentC.cpp +/ParentC.h +/ParentC.inl +/ParentS.cpp +/ParentS.h diff --git a/TAO/tests/Bug_2677_Regression/.gitignore b/TAO/tests/Bug_2677_Regression/.gitignore new file mode 100644 index 00000000000..06845b19f52 --- /dev/null +++ b/TAO/tests/Bug_2677_Regression/.gitignore @@ -0,0 +1 @@ +/server diff --git a/TAO/tests/Bug_2678_Regression/.gitignore b/TAO/tests/Bug_2678_Regression/.gitignore new file mode 100644 index 00000000000..38202305491 --- /dev/null +++ b/TAO/tests/Bug_2678_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Bug_2683_Regression/.gitignore b/TAO/tests/Bug_2683_Regression/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Bug_2683_Regression/.gitignore +++ b/TAO/tests/Bug_2683_Regression/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_2702_Regression/.gitignore b/TAO/tests/Bug_2702_Regression/.gitignore index 7149778f20e..82b7e629f67 100644 --- a/TAO/tests/Bug_2702_Regression/.gitignore +++ b/TAO/tests/Bug_2702_Regression/.gitignore @@ -1 +1,8 @@ /client +/TestA.cpp +/TestA.h +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_2734_Regression/.gitignore b/TAO/tests/Bug_2734_Regression/.gitignore new file mode 100644 index 00000000000..38202305491 --- /dev/null +++ b/TAO/tests/Bug_2734_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Bug_2735_Regression/.gitignore b/TAO/tests/Bug_2735_Regression/.gitignore new file mode 100644 index 00000000000..06845b19f52 --- /dev/null +++ b/TAO/tests/Bug_2735_Regression/.gitignore @@ -0,0 +1 @@ +/server diff --git a/TAO/tests/Bug_2768_Regression/.gitignore b/TAO/tests/Bug_2768_Regression/.gitignore new file mode 100644 index 00000000000..8c230a176de --- /dev/null +++ b/TAO/tests/Bug_2768_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/MessengerC.cpp +/MessengerC.h +/MessengerC.inl +/MessengerS.cpp +/MessengerS.h +/server diff --git a/TAO/tests/Bug_2791_Regression/.gitignore b/TAO/tests/Bug_2791_Regression/.gitignore new file mode 100644 index 00000000000..1c66517ef1a --- /dev/null +++ b/TAO/tests/Bug_2791_Regression/.gitignore @@ -0,0 +1,6 @@ +/client +/MessageC.cpp +/MessageC.h +/MessageC.inl +/MessageS.cpp +/MessageS.h diff --git a/TAO/tests/Bug_2792_Regression/.gitignore b/TAO/tests/Bug_2792_Regression/.gitignore new file mode 100644 index 00000000000..7149778f20e --- /dev/null +++ b/TAO/tests/Bug_2792_Regression/.gitignore @@ -0,0 +1 @@ +/client diff --git a/TAO/tests/Bug_2795_Regression/.gitignore b/TAO/tests/Bug_2795_Regression/.gitignore new file mode 100644 index 00000000000..7149778f20e --- /dev/null +++ b/TAO/tests/Bug_2795_Regression/.gitignore @@ -0,0 +1 @@ +/client diff --git a/TAO/tests/Bug_2804_Regression/.gitignore b/TAO/tests/Bug_2804_Regression/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/Bug_2804_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_2805_Regression/.gitignore b/TAO/tests/Bug_2805_Regression/.gitignore new file mode 100644 index 00000000000..2da0c48019f --- /dev/null +++ b/TAO/tests/Bug_2805_Regression/.gitignore @@ -0,0 +1,6 @@ +/ami_testC.cpp +/ami_testC.h +/ami_testC.inl +/ami_testS.cpp +/ami_testS.h +/client diff --git a/TAO/tests/Bug_2809_Regression/.gitignore b/TAO/tests/Bug_2809_Regression/.gitignore new file mode 100644 index 00000000000..06845b19f52 --- /dev/null +++ b/TAO/tests/Bug_2809_Regression/.gitignore @@ -0,0 +1 @@ +/server diff --git a/TAO/tests/Bug_2826_Regression/.gitignore b/TAO/tests/Bug_2826_Regression/.gitignore new file mode 100644 index 00000000000..2f442b46281 --- /dev/null +++ b/TAO/tests/Bug_2826_Regression/.gitignore @@ -0,0 +1,6 @@ +/fooC.cpp +/fooC.h +/fooC.inl +/fooS.cpp +/fooS.h +/server diff --git a/TAO/tests/Bug_2844_Regression/.gitignore b/TAO/tests/Bug_2844_Regression/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/Bug_2844_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_2869_Regression/.gitignore b/TAO/tests/Bug_2869_Regression/.gitignore new file mode 100644 index 00000000000..7149778f20e --- /dev/null +++ b/TAO/tests/Bug_2869_Regression/.gitignore @@ -0,0 +1 @@ +/client diff --git a/TAO/tests/Bug_2909_Regression/.gitignore b/TAO/tests/Bug_2909_Regression/.gitignore new file mode 100644 index 00000000000..2da0c48019f --- /dev/null +++ b/TAO/tests/Bug_2909_Regression/.gitignore @@ -0,0 +1,6 @@ +/ami_testC.cpp +/ami_testC.h +/ami_testC.inl +/ami_testS.cpp +/ami_testS.h +/client diff --git a/TAO/tests/Bug_2918_Regression/.gitignore b/TAO/tests/Bug_2918_Regression/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/Bug_2918_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_2935_Regression/.gitignore b/TAO/tests/Bug_2935_Regression/.gitignore new file mode 100644 index 00000000000..17c5d1fb499 --- /dev/null +++ b/TAO/tests/Bug_2935_Regression/.gitignore @@ -0,0 +1,8 @@ +/middle +/sink +/source +/ThreeTierC.cpp +/ThreeTierC.h +/ThreeTierC.inl +/ThreeTierS.cpp +/ThreeTierS.h diff --git a/TAO/tests/Bug_2936_Regression/.gitignore b/TAO/tests/Bug_2936_Regression/.gitignore new file mode 100644 index 00000000000..06845b19f52 --- /dev/null +++ b/TAO/tests/Bug_2936_Regression/.gitignore @@ -0,0 +1 @@ +/server diff --git a/TAO/tests/Bug_2953_Regression/.gitignore b/TAO/tests/Bug_2953_Regression/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/Bug_2953_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_2966_Regression/.gitignore b/TAO/tests/Bug_2966_Regression/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/Bug_2966_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_3000_Regression/.gitignore b/TAO/tests/Bug_3000_Regression/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/Bug_3000_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_3042_Regression/.gitignore b/TAO/tests/Bug_3042_Regression/.gitignore new file mode 100644 index 00000000000..09b6defb2a9 --- /dev/null +++ b/TAO/tests/Bug_3042_Regression/.gitignore @@ -0,0 +1,6 @@ +/client +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Bug_3068_Regression/.gitignore b/TAO/tests/Bug_3068_Regression/.gitignore new file mode 100644 index 00000000000..38202305491 --- /dev/null +++ b/TAO/tests/Bug_3068_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Bug_3108_Regression/.gitignore b/TAO/tests/Bug_3108_Regression/.gitignore new file mode 100644 index 00000000000..38202305491 --- /dev/null +++ b/TAO/tests/Bug_3108_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Bug_3163_Regression/.gitignore b/TAO/tests/Bug_3163_Regression/.gitignore new file mode 100644 index 00000000000..38202305491 --- /dev/null +++ b/TAO/tests/Bug_3163_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Bug_3171_Regression/.gitignore b/TAO/tests/Bug_3171_Regression/.gitignore new file mode 100644 index 00000000000..06845b19f52 --- /dev/null +++ b/TAO/tests/Bug_3171_Regression/.gitignore @@ -0,0 +1 @@ +/server diff --git a/TAO/tests/Bug_3198_Regression/.gitignore b/TAO/tests/Bug_3198_Regression/.gitignore new file mode 100644 index 00000000000..7149778f20e --- /dev/null +++ b/TAO/tests/Bug_3198_Regression/.gitignore @@ -0,0 +1 @@ +/client diff --git a/TAO/tests/Bug_3251_Regression/.gitignore b/TAO/tests/Bug_3251_Regression/.gitignore new file mode 100644 index 00000000000..06845b19f52 --- /dev/null +++ b/TAO/tests/Bug_3251_Regression/.gitignore @@ -0,0 +1 @@ +/server diff --git a/TAO/tests/Bug_3276_Regression/.gitignore b/TAO/tests/Bug_3276_Regression/.gitignore new file mode 100644 index 00000000000..0b842857031 --- /dev/null +++ b/TAO/tests/Bug_3276_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/manager +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Bug_3299_Regression/.gitignore b/TAO/tests/Bug_3299_Regression/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/Bug_3299_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_3311_Regression/.gitignore b/TAO/tests/Bug_3311_Regression/.gitignore new file mode 100644 index 00000000000..319aaae0698 --- /dev/null +++ b/TAO/tests/Bug_3311_Regression/.gitignore @@ -0,0 +1,6 @@ +/test +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Bug_3315_Regression/.gitignore b/TAO/tests/Bug_3315_Regression/.gitignore new file mode 100644 index 00000000000..06845b19f52 --- /dev/null +++ b/TAO/tests/Bug_3315_Regression/.gitignore @@ -0,0 +1 @@ +/server diff --git a/TAO/tests/Bug_3321_Regression/.gitignore b/TAO/tests/Bug_3321_Regression/.gitignore new file mode 100644 index 00000000000..06845b19f52 --- /dev/null +++ b/TAO/tests/Bug_3321_Regression/.gitignore @@ -0,0 +1 @@ +/server diff --git a/TAO/tests/Bug_3333_Regression/.gitignore b/TAO/tests/Bug_3333_Regression/.gitignore new file mode 100644 index 00000000000..e0054ceec1d --- /dev/null +++ b/TAO/tests/Bug_3333_Regression/.gitignore @@ -0,0 +1,7 @@ +/Bug3333_Client +/Bug3333_Server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_3384_Regression/.gitignore b/TAO/tests/Bug_3384_Regression/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/Bug_3384_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_3430_Regression/.gitignore b/TAO/tests/Bug_3430_Regression/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/Bug_3430_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_3470_Regression/.gitignore b/TAO/tests/Bug_3470_Regression/.gitignore new file mode 100644 index 00000000000..7149778f20e --- /dev/null +++ b/TAO/tests/Bug_3470_Regression/.gitignore @@ -0,0 +1 @@ +/client diff --git a/TAO/tests/Bug_3471_Regression/.gitignore b/TAO/tests/Bug_3471_Regression/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/Bug_3471_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_3479_Regression/.gitignore b/TAO/tests/Bug_3479_Regression/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/Bug_3479_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_3481_Regression/.gitignore b/TAO/tests/Bug_3481_Regression/.gitignore new file mode 100644 index 00000000000..e34cc16d371 --- /dev/null +++ b/TAO/tests/Bug_3481_Regression/.gitignore @@ -0,0 +1,6 @@ +/Bug_3481_Regression +/FooC.cpp +/FooC.h +/FooC.inl +/FooS.cpp +/FooS.h diff --git a/TAO/tests/Bug_3499_Regression/.gitignore b/TAO/tests/Bug_3499_Regression/.gitignore new file mode 100644 index 00000000000..9569ec8bfa7 --- /dev/null +++ b/TAO/tests/Bug_3499_Regression/.gitignore @@ -0,0 +1 @@ +/Bug_3499_Regression diff --git a/TAO/tests/Bug_3506_Regression/.gitignore b/TAO/tests/Bug_3506_Regression/.gitignore new file mode 100644 index 00000000000..4905555aff2 --- /dev/null +++ b/TAO/tests/Bug_3506_Regression/.gitignore @@ -0,0 +1,12 @@ +/client +/IF_EXE_M_R_EnumsC.cpp +/IF_EXE_M_R_EnumsC.h +/IF_EXE_M_R_EnumsC.inl +/IF_EXE_M_R_EnumsS.cpp +/IF_EXE_M_R_EnumsS.h +/IF_EXE_M_R_StructsC.cpp +/IF_EXE_M_R_StructsC.h +/IF_EXE_M_R_StructsC.inl +/IF_EXE_M_R_StructsS.cpp +/IF_EXE_M_R_StructsS.h +/server diff --git a/TAO/tests/Bug_3513_Regression/.gitignore b/TAO/tests/Bug_3513_Regression/.gitignore new file mode 100644 index 00000000000..319aaae0698 --- /dev/null +++ b/TAO/tests/Bug_3513_Regression/.gitignore @@ -0,0 +1,6 @@ +/test +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Bug_3514_Regression/.gitignore b/TAO/tests/Bug_3514_Regression/.gitignore new file mode 100644 index 00000000000..319aaae0698 --- /dev/null +++ b/TAO/tests/Bug_3514_Regression/.gitignore @@ -0,0 +1,6 @@ +/test +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Bug_3524_Regression/.gitignore b/TAO/tests/Bug_3524_Regression/.gitignore new file mode 100644 index 00000000000..38202305491 --- /dev/null +++ b/TAO/tests/Bug_3524_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Bug_3531_Regression/.gitignore b/TAO/tests/Bug_3531_Regression/.gitignore new file mode 100644 index 00000000000..38202305491 --- /dev/null +++ b/TAO/tests/Bug_3531_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Bug_3531b_Regression/.gitignore b/TAO/tests/Bug_3531b_Regression/.gitignore new file mode 100644 index 00000000000..06845b19f52 --- /dev/null +++ b/TAO/tests/Bug_3531b_Regression/.gitignore @@ -0,0 +1 @@ +/server diff --git a/TAO/tests/Bug_3542_Regression/.gitignore b/TAO/tests/Bug_3542_Regression/.gitignore new file mode 100644 index 00000000000..06845b19f52 --- /dev/null +++ b/TAO/tests/Bug_3542_Regression/.gitignore @@ -0,0 +1 @@ +/server diff --git a/TAO/tests/Bug_3543_Regression/.gitignore b/TAO/tests/Bug_3543_Regression/.gitignore new file mode 100644 index 00000000000..6d699e08c65 --- /dev/null +++ b/TAO/tests/Bug_3543_Regression/.gitignore @@ -0,0 +1,7 @@ +/master +/masterC.cpp +/masterC.h +/masterC.inl +/masterS.cpp +/masterS.h +/server diff --git a/TAO/tests/Bug_3547_Regression/.gitignore b/TAO/tests/Bug_3547_Regression/.gitignore new file mode 100644 index 00000000000..7ab4630eeaa --- /dev/null +++ b/TAO/tests/Bug_3547_Regression/.gitignore @@ -0,0 +1,17 @@ +/client +/server +/Stock_Quoter_TypesC.cpp +/Stock_Quoter_TypesC.h +/Stock_Quoter_TypesC.inl +/Stock_Quoter_TypesS.cpp +/Stock_Quoter_TypesS.h +/Stock_QuoterC.cpp +/Stock_QuoterC.h +/Stock_QuoterC.inl +/Stock_QuoterS.cpp +/Stock_QuoterS.h +/UDPTestC.cpp +/UDPTestC.h +/UDPTestC.inl +/UDPTestS.cpp +/UDPTestS.h diff --git a/TAO/tests/Bug_3548_Regression/.gitignore b/TAO/tests/Bug_3548_Regression/.gitignore new file mode 100644 index 00000000000..80492a219f9 --- /dev/null +++ b/TAO/tests/Bug_3548_Regression/.gitignore @@ -0,0 +1,6 @@ +/client +/memeaterC.cpp +/memeaterC.h +/memeaterC.inl +/memeaterS.cpp +/memeaterS.h diff --git a/TAO/tests/Bug_3552_Regression/.gitignore b/TAO/tests/Bug_3552_Regression/.gitignore new file mode 100644 index 00000000000..1471a282834 --- /dev/null +++ b/TAO/tests/Bug_3552_Regression/.gitignore @@ -0,0 +1,5 @@ +/check +/structC.cpp +/structC.h +/structC.inl +/structS.h diff --git a/TAO/tests/Bug_3553_Regression/.gitignore b/TAO/tests/Bug_3553_Regression/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/Bug_3553_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_3558_Regression/.gitignore b/TAO/tests/Bug_3558_Regression/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/Bug_3558_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_3559_Regression/.gitignore b/TAO/tests/Bug_3559_Regression/.gitignore new file mode 100644 index 00000000000..06845b19f52 --- /dev/null +++ b/TAO/tests/Bug_3559_Regression/.gitignore @@ -0,0 +1 @@ +/server diff --git a/TAO/tests/Bug_3565_Regression/.gitignore b/TAO/tests/Bug_3565_Regression/.gitignore new file mode 100644 index 00000000000..06845b19f52 --- /dev/null +++ b/TAO/tests/Bug_3565_Regression/.gitignore @@ -0,0 +1 @@ +/server diff --git a/TAO/tests/Bug_3566_Regression/.gitignore b/TAO/tests/Bug_3566_Regression/.gitignore new file mode 100644 index 00000000000..06845b19f52 --- /dev/null +++ b/TAO/tests/Bug_3566_Regression/.gitignore @@ -0,0 +1 @@ +/server diff --git a/TAO/tests/Bug_3567_Regression/.gitignore b/TAO/tests/Bug_3567_Regression/.gitignore new file mode 100644 index 00000000000..142d0c032f0 --- /dev/null +++ b/TAO/tests/Bug_3567_Regression/.gitignore @@ -0,0 +1,7 @@ +/ami_testC.cpp +/ami_testC.h +/ami_testC.inl +/ami_testS.cpp +/ami_testS.h +/client +/server diff --git a/TAO/tests/Bug_3574_Regression/.gitignore b/TAO/tests/Bug_3574_Regression/.gitignore new file mode 100644 index 00000000000..7149778f20e --- /dev/null +++ b/TAO/tests/Bug_3574_Regression/.gitignore @@ -0,0 +1 @@ +/client diff --git a/TAO/tests/Bug_3574_Regression/test.cpp b/TAO/tests/Bug_3574_Regression/test.cpp index f5b3f38da6f..acbbf98b012 100644 --- a/TAO/tests/Bug_3574_Regression/test.cpp +++ b/TAO/tests/Bug_3574_Regression/test.cpp @@ -1,6 +1,6 @@ #include "tao/StringSeqC.h" -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x730) +#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) # pragma option push -w-8011 #endif @@ -52,6 +52,6 @@ ACE_TMAIN (int, ACE_TCHAR *[]) return 0; } -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x730) +#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) # pragma option pop #endif diff --git a/TAO/tests/Bug_3575_Regression/.gitignore b/TAO/tests/Bug_3575_Regression/.gitignore new file mode 100644 index 00000000000..7149778f20e --- /dev/null +++ b/TAO/tests/Bug_3575_Regression/.gitignore @@ -0,0 +1 @@ +/client diff --git a/TAO/tests/Bug_3597_Regression/.gitignore b/TAO/tests/Bug_3597_Regression/.gitignore new file mode 100644 index 00000000000..06845b19f52 --- /dev/null +++ b/TAO/tests/Bug_3597_Regression/.gitignore @@ -0,0 +1 @@ +/server diff --git a/TAO/tests/Bug_3598a_Regression/.gitignore b/TAO/tests/Bug_3598a_Regression/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/Bug_3598a_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_3630_Regression/.gitignore b/TAO/tests/Bug_3630_Regression/.gitignore new file mode 100644 index 00000000000..06845b19f52 --- /dev/null +++ b/TAO/tests/Bug_3630_Regression/.gitignore @@ -0,0 +1 @@ +/server diff --git a/TAO/tests/Bug_3632_Regression/.gitignore b/TAO/tests/Bug_3632_Regression/.gitignore new file mode 100644 index 00000000000..09b6defb2a9 --- /dev/null +++ b/TAO/tests/Bug_3632_Regression/.gitignore @@ -0,0 +1,6 @@ +/client +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Bug_3636_Regression/.gitignore b/TAO/tests/Bug_3636_Regression/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/Bug_3636_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_3647_Regression/.gitignore b/TAO/tests/Bug_3647_Regression/.gitignore new file mode 100644 index 00000000000..81005bea12b --- /dev/null +++ b/TAO/tests/Bug_3647_Regression/.gitignore @@ -0,0 +1,8 @@ +/backend_server +/client +/middle_server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_3672_Regression/.gitignore b/TAO/tests/Bug_3672_Regression/.gitignore new file mode 100644 index 00000000000..142d0c032f0 --- /dev/null +++ b/TAO/tests/Bug_3672_Regression/.gitignore @@ -0,0 +1,7 @@ +/ami_testC.cpp +/ami_testC.h +/ami_testC.inl +/ami_testS.cpp +/ami_testS.h +/client +/server diff --git a/TAO/tests/Bug_3674_Regression/.gitignore b/TAO/tests/Bug_3674_Regression/.gitignore new file mode 100644 index 00000000000..60045a24842 --- /dev/null +++ b/TAO/tests/Bug_3674_Regression/.gitignore @@ -0,0 +1,6 @@ +/Bug_3674_Regression +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Bug_3676_Regression/.gitignore b/TAO/tests/Bug_3676_Regression/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/Bug_3676_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_3683_Regression/.gitignore b/TAO/tests/Bug_3683_Regression/.gitignore new file mode 100644 index 00000000000..9cd00b48b6b --- /dev/null +++ b/TAO/tests/Bug_3683_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/EchoC.cpp +/EchoC.h +/EchoC.inl +/EchoS.cpp +/EchoS.h +/server diff --git a/TAO/tests/Bug_3695_Regression/.gitignore b/TAO/tests/Bug_3695_Regression/.gitignore new file mode 100644 index 00000000000..a4f6c9c43ff --- /dev/null +++ b/TAO/tests/Bug_3695_Regression/.gitignore @@ -0,0 +1 @@ +/Bug_3695_Regression diff --git a/TAO/tests/Bug_3701_Regression/.gitignore b/TAO/tests/Bug_3701_Regression/.gitignore new file mode 100644 index 00000000000..7149778f20e --- /dev/null +++ b/TAO/tests/Bug_3701_Regression/.gitignore @@ -0,0 +1 @@ +/client diff --git a/TAO/tests/Bug_3746_Regression/.gitignore b/TAO/tests/Bug_3746_Regression/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/Bug_3746_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_3748_Regression/.gitignore b/TAO/tests/Bug_3748_Regression/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/Bug_3748_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_3755_Ext_Regression/.gitignore b/TAO/tests/Bug_3755_Ext_Regression/.gitignore new file mode 100644 index 00000000000..06845b19f52 --- /dev/null +++ b/TAO/tests/Bug_3755_Ext_Regression/.gitignore @@ -0,0 +1 @@ +/server diff --git a/TAO/tests/Bug_3755_Regression/.gitignore b/TAO/tests/Bug_3755_Regression/.gitignore new file mode 100644 index 00000000000..06845b19f52 --- /dev/null +++ b/TAO/tests/Bug_3755_Regression/.gitignore @@ -0,0 +1 @@ +/server diff --git a/TAO/tests/Bug_3766_Regression/.gitignore b/TAO/tests/Bug_3766_Regression/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/Bug_3766_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_3768_Regression/.gitignore b/TAO/tests/Bug_3768_Regression/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/Bug_3768_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_3790_Regression/.gitignore b/TAO/tests/Bug_3790_Regression/.gitignore new file mode 100644 index 00000000000..dc19f8aedc4 --- /dev/null +++ b/TAO/tests/Bug_3790_Regression/.gitignore @@ -0,0 +1,7 @@ +/server +/server2 +/simple_testC.cpp +/simple_testC.h +/simple_testC.inl +/simple_testS.cpp +/simple_testS.h diff --git a/TAO/tests/Bug_3801_Regression/.gitignore b/TAO/tests/Bug_3801_Regression/.gitignore new file mode 100644 index 00000000000..048389a5852 --- /dev/null +++ b/TAO/tests/Bug_3801_Regression/.gitignore @@ -0,0 +1,7 @@ +/ami_testC.cpp +/ami_testC.h +/ami_testC.inl +/ami_testS.cpp +/ami_testS.h +/server +/simple_client diff --git a/TAO/tests/Bug_3821_Regression/.gitignore b/TAO/tests/Bug_3821_Regression/.gitignore new file mode 100644 index 00000000000..f9e7f2b4fbb --- /dev/null +++ b/TAO/tests/Bug_3821_Regression/.gitignore @@ -0,0 +1,5 @@ +/client +/testC.cpp +/testC.h +/testC.inl +/testS.h diff --git a/TAO/tests/Bug_3826_Regression/.gitignore b/TAO/tests/Bug_3826_Regression/.gitignore new file mode 100644 index 00000000000..06845b19f52 --- /dev/null +++ b/TAO/tests/Bug_3826_Regression/.gitignore @@ -0,0 +1 @@ +/server diff --git a/TAO/tests/Bug_3827_Regression/.gitignore b/TAO/tests/Bug_3827_Regression/.gitignore new file mode 100644 index 00000000000..95fc22c305d --- /dev/null +++ b/TAO/tests/Bug_3827_Regression/.gitignore @@ -0,0 +1,6 @@ +/MessageC.cpp +/MessageC.h +/MessageC.inl +/MessageS.cpp +/MessageS.h +/test diff --git a/TAO/tests/Bug_3837_Regression/.gitignore b/TAO/tests/Bug_3837_Regression/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/Bug_3837_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_3853_Regression/.gitignore b/TAO/tests/Bug_3853_Regression/.gitignore new file mode 100644 index 00000000000..29241572c45 --- /dev/null +++ b/TAO/tests/Bug_3853_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/HelloC.cpp +/HelloC.h +/HelloC.inl +/HelloS.cpp +/HelloS.h +/server diff --git a/TAO/tests/Bug_3896_Regression/.gitignore b/TAO/tests/Bug_3896_Regression/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/Bug_3896_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_3919_Regression/.gitignore b/TAO/tests/Bug_3919_Regression/.gitignore new file mode 100644 index 00000000000..1edc7cd4777 --- /dev/null +++ b/TAO/tests/Bug_3919_Regression/.gitignore @@ -0,0 +1,12 @@ +/client +/server +/Test2C.cpp +/Test2C.h +/Test2C.inl +/Test2S.cpp +/Test2S.h +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_3926_Regression/.gitignore b/TAO/tests/Bug_3926_Regression/.gitignore new file mode 100644 index 00000000000..38202305491 --- /dev/null +++ b/TAO/tests/Bug_3926_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Bug_3940_Regression/.gitignore b/TAO/tests/Bug_3940_Regression/.gitignore new file mode 100644 index 00000000000..e1555c28d5a --- /dev/null +++ b/TAO/tests/Bug_3940_Regression/.gitignore @@ -0,0 +1,5 @@ +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Bug_3941_Regression/.gitignore b/TAO/tests/Bug_3941_Regression/.gitignore new file mode 100644 index 00000000000..18604fdefd8 --- /dev/null +++ b/TAO/tests/Bug_3941_Regression/.gitignore @@ -0,0 +1,6 @@ +/test3941 +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Bug_3941_Regression/test.cpp b/TAO/tests/Bug_3941_Regression/test.cpp index cd183759598..661c3bc07ca 100644 --- a/TAO/tests/Bug_3941_Regression/test.cpp +++ b/TAO/tests/Bug_3941_Regression/test.cpp @@ -57,7 +57,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) i = i->cont ()) { CORBA::ULong len = i->length (); - ACE_OS_String::memcpy (buffer, i->rd_ptr (), (size_t) len); + ACE_OS::memcpy (buffer, i->rd_ptr (), (size_t) len); buffer += len; } diff --git a/TAO/tests/Bug_3942_Regression/.gitignore b/TAO/tests/Bug_3942_Regression/.gitignore new file mode 100644 index 00000000000..6a133209486 --- /dev/null +++ b/TAO/tests/Bug_3942_Regression/.gitignore @@ -0,0 +1,6 @@ +/Bug_3942_Regression +/FooC.cpp +/FooC.h +/FooC.inl +/FooS.cpp +/FooS.h diff --git a/TAO/tests/Bug_3953_Regression/.gitignore b/TAO/tests/Bug_3953_Regression/.gitignore new file mode 100644 index 00000000000..38202305491 --- /dev/null +++ b/TAO/tests/Bug_3953_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Bug_3954_Regression/.gitignore b/TAO/tests/Bug_3954_Regression/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Bug_3954_Regression/.gitignore +++ b/TAO/tests/Bug_3954_Regression/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_4010_Regression/.gitignore b/TAO/tests/Bug_4010_Regression/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/Bug_4010_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_4059_Regression/.gitignore b/TAO/tests/Bug_4059_Regression/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/Bug_4059_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_4082_Regression/.gitignore b/TAO/tests/Bug_4082_Regression/.gitignore new file mode 100644 index 00000000000..21c004bf418 --- /dev/null +++ b/TAO/tests/Bug_4082_Regression/.gitignore @@ -0,0 +1,6 @@ +/Bug_4082_RegressionC.cpp +/Bug_4082_RegressionC.h +/Bug_4082_RegressionC.inl +/Bug_4082_RegressionS.cpp +/Bug_4082_RegressionS.h +/client diff --git a/TAO/tests/Bug_4097_Regression/.gitignore b/TAO/tests/Bug_4097_Regression/.gitignore new file mode 100644 index 00000000000..96eebc89f9a --- /dev/null +++ b/TAO/tests/Bug_4097_Regression/.gitignore @@ -0,0 +1,6 @@ +/Bug_4097_Regression +/Bug_4097_RegressionC.cpp +/Bug_4097_RegressionC.h +/Bug_4097_RegressionC.inl +/Bug_4097_RegressionS.cpp +/Bug_4097_RegressionS.h diff --git a/TAO/tests/Bug_4213_Regression/.gitignore b/TAO/tests/Bug_4213_Regression/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/Bug_4213_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Bug_933_Regression/.gitignore b/TAO/tests/Bug_933_Regression/.gitignore new file mode 100644 index 00000000000..8c230a176de --- /dev/null +++ b/TAO/tests/Bug_933_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/MessengerC.cpp +/MessengerC.h +/MessengerC.inl +/MessengerS.cpp +/MessengerS.h +/server diff --git a/TAO/tests/COIOP/.gitignore b/TAO/tests/COIOP/.gitignore index 059f3bf89df..70fe97feed4 100644 --- a/TAO/tests/COIOP/.gitignore +++ b/TAO/tests/COIOP/.gitignore @@ -1 +1,7 @@ +/COIOP_Simple_Test /COIOP_Test +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/CORBA_e_Implicit_Activation/.gitignore b/TAO/tests/CORBA_e_Implicit_Activation/.gitignore new file mode 100644 index 00000000000..41f66e96d8f --- /dev/null +++ b/TAO/tests/CORBA_e_Implicit_Activation/.gitignore @@ -0,0 +1,6 @@ +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/CSD_Collocation/.gitignore b/TAO/tests/CSD_Collocation/.gitignore new file mode 100644 index 00000000000..e677c62a061 --- /dev/null +++ b/TAO/tests/CSD_Collocation/.gitignore @@ -0,0 +1,6 @@ +/Collocation +/DiamondC.cpp +/DiamondC.h +/DiamondC.inl +/DiamondS.cpp +/DiamondS.h diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/.gitignore b/TAO/tests/CSD_Strategy_Tests/TP_Common/.gitignore new file mode 100644 index 00000000000..3009e031003 --- /dev/null +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/.gitignore @@ -0,0 +1,20 @@ +/CancelledExceptionC.cpp +/CancelledExceptionC.h +/CancelledExceptionC.inl +/CancelledExceptionS.cpp +/CancelledExceptionS.h +/CustomExceptionC.cpp +/CustomExceptionC.h +/CustomExceptionC.inl +/CustomExceptionS.cpp +/CustomExceptionS.h +/FooExceptionC.cpp +/FooExceptionC.h +/FooExceptionC.inl +/FooExceptionS.cpp +/FooExceptionS.h +/TestAppExceptionC.cpp +/TestAppExceptionC.h +/TestAppExceptionC.inl +/TestAppExceptionS.cpp +/TestAppExceptionS.h diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/.gitignore b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/.gitignore new file mode 100644 index 00000000000..ab2ddd6538a --- /dev/null +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/.gitignore @@ -0,0 +1,5 @@ +/Foo_AC.cpp +/Foo_AC.h +/Foo_AC.inl +/Foo_AS.cpp +/Foo_AS.h diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/.gitignore b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/.gitignore new file mode 100644 index 00000000000..b6162940fd3 --- /dev/null +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/.gitignore @@ -0,0 +1,10 @@ +/CallbackC.cpp +/CallbackC.h +/CallbackC.inl +/CallbackS.cpp +/CallbackS.h +/Foo_BC.cpp +/Foo_BC.h +/Foo_BC.inl +/Foo_BS.cpp +/Foo_BS.h diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/.gitignore b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/.gitignore new file mode 100644 index 00000000000..46ec2b51800 --- /dev/null +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/.gitignore @@ -0,0 +1,5 @@ +/Foo_CC.cpp +/Foo_CC.h +/Foo_CC.inl +/Foo_CS.cpp +/Foo_CS.h diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/.gitignore b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/.gitignore +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Cache_Growth_Test/.gitignore b/TAO/tests/Cache_Growth_Test/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Cache_Growth_Test/.gitignore +++ b/TAO/tests/Cache_Growth_Test/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/CallbackTest/.gitignore b/TAO/tests/CallbackTest/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/CallbackTest/.gitignore +++ b/TAO/tests/CallbackTest/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/ClientPortSpan/.gitignore b/TAO/tests/ClientPortSpan/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/ClientPortSpan/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Client_Leaks/.gitignore b/TAO/tests/Client_Leaks/.gitignore index bf0c468b91e..623c91dc16a 100644 --- a/TAO/tests/Client_Leaks/.gitignore +++ b/TAO/tests/Client_Leaks/.gitignore @@ -1,3 +1,8 @@ /child /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/CodeSets/simple/.gitignore b/TAO/tests/CodeSets/simple/.gitignore index 3d33a15f751..feb90bbd60a 100644 --- a/TAO/tests/CodeSets/simple/.gitignore +++ b/TAO/tests/CodeSets/simple/.gitignore @@ -1,2 +1,7 @@ /client /server +/simpleC.cpp +/simpleC.h +/simpleC.inl +/simpleS.cpp +/simpleS.h diff --git a/TAO/tests/Codec/.gitignore b/TAO/tests/Codec/.gitignore index 7149778f20e..09b6defb2a9 100644 --- a/TAO/tests/Codec/.gitignore +++ b/TAO/tests/Codec/.gitignore @@ -1 +1,6 @@ /client +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/.gitignore b/TAO/tests/Collocated_Best/Collocated_Best_Direct/.gitignore new file mode 100644 index 00000000000..f73df7a8fb6 --- /dev/null +++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/.gitignore @@ -0,0 +1,6 @@ +/Collocated_Best_Direct +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/.gitignore b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/.gitignore new file mode 100644 index 00000000000..51865f5749f --- /dev/null +++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/.gitignore @@ -0,0 +1,6 @@ +/Collocated_Best_NoColl +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/.gitignore b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/.gitignore new file mode 100644 index 00000000000..215236dda43 --- /dev/null +++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/.gitignore @@ -0,0 +1,6 @@ +/Collocated_Best_ThruP +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Collocated_DerivedIF/.gitignore b/TAO/tests/Collocated_DerivedIF/.gitignore new file mode 100644 index 00000000000..44e2323726e --- /dev/null +++ b/TAO/tests/Collocated_DerivedIF/.gitignore @@ -0,0 +1,6 @@ +/Collocated_DerivedIF +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Collocated_Forwarding/.gitignore b/TAO/tests/Collocated_Forwarding/.gitignore new file mode 100644 index 00000000000..d8866c41147 --- /dev/null +++ b/TAO/tests/Collocated_Forwarding/.gitignore @@ -0,0 +1,6 @@ +/server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Collocated_NoColl/.gitignore b/TAO/tests/Collocated_NoColl/.gitignore new file mode 100644 index 00000000000..92a45a75829 --- /dev/null +++ b/TAO/tests/Collocated_NoColl/.gitignore @@ -0,0 +1,6 @@ +/Collocated_NoColl +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Collocated_ThruP_Sp/.gitignore b/TAO/tests/Collocated_ThruP_Sp/.gitignore new file mode 100644 index 00000000000..4717b6306a3 --- /dev/null +++ b/TAO/tests/Collocated_ThruP_Sp/.gitignore @@ -0,0 +1,6 @@ +/Collocated_ThruP_Sp +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/.gitignore b/TAO/tests/Collocated_ThruP_Sp_Gd/.gitignore new file mode 100644 index 00000000000..b78ea4575f5 --- /dev/null +++ b/TAO/tests/Collocated_ThruP_Sp_Gd/.gitignore @@ -0,0 +1,6 @@ +/Coll_ThruP_Sp_Gd +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Collocation/.gitignore b/TAO/tests/Collocation/.gitignore index d66b2a12584..e677c62a061 100644 --- a/TAO/tests/Collocation/.gitignore +++ b/TAO/tests/Collocation/.gitignore @@ -1 +1,6 @@ /Collocation +/DiamondC.cpp +/DiamondC.h +/DiamondC.inl +/DiamondS.cpp +/DiamondS.h diff --git a/TAO/tests/CollocationLockup/.gitignore b/TAO/tests/CollocationLockup/.gitignore index a18271981a8..67fb49e68f6 100644 --- a/TAO/tests/CollocationLockup/.gitignore +++ b/TAO/tests/CollocationLockup/.gitignore @@ -1,2 +1,12 @@ +/ABC.cpp +/ABC.h +/ABC.inl +/ABS.cpp +/ABS.h /CollocationLockup /SimpleNamingService +/SimpleNamingServiceC.cpp +/SimpleNamingServiceC.h +/SimpleNamingServiceC.inl +/SimpleNamingServiceS.cpp +/SimpleNamingServiceS.h diff --git a/TAO/tests/Collocation_Exception_Test/.gitignore b/TAO/tests/Collocation_Exception_Test/.gitignore index 5c2c1ae9f35..aebafbbb08f 100644 --- a/TAO/tests/Collocation_Exception_Test/.gitignore +++ b/TAO/tests/Collocation_Exception_Test/.gitignore @@ -1 +1,6 @@ /Collocated_Test +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Collocation_Oneway_Tests/.gitignore b/TAO/tests/Collocation_Oneway_Tests/.gitignore index 5c2c1ae9f35..aebafbbb08f 100644 --- a/TAO/tests/Collocation_Oneway_Tests/.gitignore +++ b/TAO/tests/Collocation_Oneway_Tests/.gitignore @@ -1 +1,6 @@ /Collocated_Test +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Collocation_Opportunities/.gitignore b/TAO/tests/Collocation_Opportunities/.gitignore index 572fec49f21..e285bc68e27 100644 --- a/TAO/tests/Collocation_Opportunities/.gitignore +++ b/TAO/tests/Collocation_Opportunities/.gitignore @@ -1 +1,6 @@ /Collocation_Opportunities +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Collocation_Tests/.gitignore b/TAO/tests/Collocation_Tests/.gitignore index 5c2c1ae9f35..aebafbbb08f 100644 --- a/TAO/tests/Collocation_Tests/.gitignore +++ b/TAO/tests/Collocation_Tests/.gitignore @@ -1 +1,6 @@ /Collocated_Test +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Compression/.gitignore b/TAO/tests/Compression/.gitignore new file mode 100644 index 00000000000..5d1fe11ef56 --- /dev/null +++ b/TAO/tests/Compression/.gitignore @@ -0,0 +1 @@ +/rleserver diff --git a/TAO/tests/Connect_Strategy_Test/.gitignore b/TAO/tests/Connect_Strategy_Test/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Connect_Strategy_Test/.gitignore +++ b/TAO/tests/Connect_Strategy_Test/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Connection_Failure/.gitignore b/TAO/tests/Connection_Failure/.gitignore index 7149778f20e..09b6defb2a9 100644 --- a/TAO/tests/Connection_Failure/.gitignore +++ b/TAO/tests/Connection_Failure/.gitignore @@ -1 +1,6 @@ /client +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Connection_Purging/.gitignore b/TAO/tests/Connection_Purging/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/Connection_Purging/.gitignore +++ b/TAO/tests/Connection_Purging/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Connection_Timeout/.gitignore b/TAO/tests/Connection_Timeout/.gitignore index 7149778f20e..2eef27fee30 100644 --- a/TAO/tests/Connection_Timeout/.gitignore +++ b/TAO/tests/Connection_Timeout/.gitignore @@ -1 +1,6 @@ /client +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Crash_On_Write/.gitignore b/TAO/tests/Crash_On_Write/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Crash_On_Write/.gitignore +++ b/TAO/tests/Crash_On_Write/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Crashed_Callback/.gitignore b/TAO/tests/Crashed_Callback/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Crashed_Callback/.gitignore +++ b/TAO/tests/Crashed_Callback/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/DII_AMI_Forward/.gitignore b/TAO/tests/DII_AMI_Forward/.gitignore new file mode 100644 index 00000000000..38202305491 --- /dev/null +++ b/TAO/tests/DII_AMI_Forward/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/DII_AMI_Forward/server_interceptor.cpp b/TAO/tests/DII_AMI_Forward/server_interceptor.cpp index a0e4e272729..5a6df2d5af6 100644 --- a/TAO/tests/DII_AMI_Forward/server_interceptor.cpp +++ b/TAO/tests/DII_AMI_Forward/server_interceptor.cpp @@ -62,8 +62,8 @@ ForwardTest_Request_Interceptor::receive_request_service_contexts ( // locally on the server side as a side effect of another call, // meaning that the client hasn't added the service context yet. // Same goes for the shutdown call - if (ACE_OS_String::strcmp ("_is_a", operation.in ()) == 0 || - ACE_OS_String::strcmp ("shutdown", operation.in ()) == 0) + if (ACE_OS::strcmp ("_is_a", operation.in ()) == 0 || + ACE_OS::strcmp ("shutdown", operation.in ()) == 0) return; if (!forward_location_done_) diff --git a/TAO/tests/DII_Collocation_Tests/oneway/.gitignore b/TAO/tests/DII_Collocation_Tests/oneway/.gitignore index 5c2c1ae9f35..aebafbbb08f 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/.gitignore +++ b/TAO/tests/DII_Collocation_Tests/oneway/.gitignore @@ -1 +1,6 @@ /Collocated_Test +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/DII_Collocation_Tests/twoway/.gitignore b/TAO/tests/DII_Collocation_Tests/twoway/.gitignore index 5c2c1ae9f35..aebafbbb08f 100644 --- a/TAO/tests/DII_Collocation_Tests/twoway/.gitignore +++ b/TAO/tests/DII_Collocation_Tests/twoway/.gitignore @@ -1 +1,6 @@ /Collocated_Test +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/DII_Deferred_Transient/.gitignore b/TAO/tests/DII_Deferred_Transient/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/DII_Deferred_Transient/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/DII_Discard_Deferred/.gitignore b/TAO/tests/DII_Discard_Deferred/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/DII_Discard_Deferred/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/DIOP/.gitignore b/TAO/tests/DIOP/.gitignore new file mode 100644 index 00000000000..d8aeecd2de0 --- /dev/null +++ b/TAO/tests/DIOP/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/UDPC.cpp +/UDPC.h +/UDPC.inl +/UDPS.cpp +/UDPS.h diff --git a/TAO/tests/DLL_ORB/.gitignore b/TAO/tests/DLL_ORB/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/DLL_ORB/.gitignore +++ b/TAO/tests/DLL_ORB/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/DSI_AMH/.gitignore b/TAO/tests/DSI_AMH/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/DSI_AMH/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/DSI_AMI_Gateway/.gitignore b/TAO/tests/DSI_AMI_Gateway/.gitignore new file mode 100644 index 00000000000..4525f40520c --- /dev/null +++ b/TAO/tests/DSI_AMI_Gateway/.gitignore @@ -0,0 +1,8 @@ +/client +/gateway +/server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/DSI_Gateway/.gitignore b/TAO/tests/DSI_Gateway/.gitignore index d9382c7269d..4525f40520c 100644 --- a/TAO/tests/DSI_Gateway/.gitignore +++ b/TAO/tests/DSI_Gateway/.gitignore @@ -1,3 +1,8 @@ /client /gateway /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/DiffServ/.gitignore b/TAO/tests/DiffServ/.gitignore new file mode 100644 index 00000000000..38202305491 --- /dev/null +++ b/TAO/tests/DiffServ/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/DynAny_Test/.gitignore b/TAO/tests/DynAny_Test/.gitignore index c549137d318..1786c722600 100644 --- a/TAO/tests/DynAny_Test/.gitignore +++ b/TAO/tests/DynAny_Test/.gitignore @@ -1 +1,6 @@ /basic_test +/da_testsC.cpp +/da_testsC.h +/da_testsC.inl +/da_testsS.cpp +/da_testsS.h diff --git a/TAO/tests/DynUnion_Test/.gitignore b/TAO/tests/DynUnion_Test/.gitignore new file mode 100644 index 00000000000..e5d15bf05e4 --- /dev/null +++ b/TAO/tests/DynUnion_Test/.gitignore @@ -0,0 +1,6 @@ +/dynanyC.cpp +/dynanyC.h +/dynanyC.inl +/dynanyS.cpp +/dynanyS.h +/dynuniontest diff --git a/TAO/tests/DynValue_Test/.gitignore b/TAO/tests/DynValue_Test/.gitignore new file mode 100644 index 00000000000..c45d2d3f28f --- /dev/null +++ b/TAO/tests/DynValue_Test/.gitignore @@ -0,0 +1,5 @@ +/DynValue_Test +/DynValue_TestC.cpp +/DynValue_TestC.h +/DynValue_TestC.inl +/DynValue_TestS.h diff --git a/TAO/tests/Dynamic_TP/Config_Loader/.gitignore b/TAO/tests/Dynamic_TP/Config_Loader/.gitignore new file mode 100644 index 00000000000..ee4c9268234 --- /dev/null +++ b/TAO/tests/Dynamic_TP/Config_Loader/.gitignore @@ -0,0 +1 @@ +/test diff --git a/TAO/tests/Dynamic_TP/ORB_ThreadPool/.gitignore b/TAO/tests/Dynamic_TP/ORB_ThreadPool/.gitignore new file mode 100644 index 00000000000..685331f10a3 --- /dev/null +++ b/TAO/tests/Dynamic_TP/ORB_ThreadPool/.gitignore @@ -0,0 +1,8 @@ +/client +/middle +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Dynamic_TP/POA_Loader/.gitignore b/TAO/tests/Dynamic_TP/POA_Loader/.gitignore new file mode 100644 index 00000000000..ee4c9268234 --- /dev/null +++ b/TAO/tests/Dynamic_TP/POA_Loader/.gitignore @@ -0,0 +1 @@ +/test diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/.gitignore b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/.gitignore b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Explicit_Event_Loop/.gitignore b/TAO/tests/Explicit_Event_Loop/.gitignore index 3d33a15f751..0f86df34458 100644 --- a/TAO/tests/Explicit_Event_Loop/.gitignore +++ b/TAO/tests/Explicit_Event_Loop/.gitignore @@ -1,2 +1,7 @@ /client /server +/timeC.cpp +/timeC.h +/timeC.inl +/timeS.cpp +/timeS.h diff --git a/TAO/tests/Exposed_Policies/.gitignore b/TAO/tests/Exposed_Policies/.gitignore index 3d33a15f751..9a818541764 100644 --- a/TAO/tests/Exposed_Policies/.gitignore +++ b/TAO/tests/Exposed_Policies/.gitignore @@ -1,2 +1,7 @@ /client +/CounterC.cpp +/CounterC.h +/CounterC.inl +/CounterS.cpp +/CounterS.h /server diff --git a/TAO/tests/Faults/.gitignore b/TAO/tests/Faults/.gitignore index ec6511e9d9e..bd787f4158f 100644 --- a/TAO/tests/Faults/.gitignore +++ b/TAO/tests/Faults/.gitignore @@ -1,5 +1,15 @@ /client /middle /ping +/pingC.cpp +/pingC.h +/pingC.inl +/pingS.cpp +/pingS.h /pong /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/File_IO/.gitignore b/TAO/tests/File_IO/.gitignore index 3d33a15f751..86187fc48be 100644 --- a/TAO/tests/File_IO/.gitignore +++ b/TAO/tests/File_IO/.gitignore @@ -1,2 +1,7 @@ /client +/FileC.cpp +/FileC.h +/FileC.inl +/FileS.cpp +/FileS.h /server diff --git a/TAO/tests/ForwardOnceUponException/.gitignore b/TAO/tests/ForwardOnceUponException/.gitignore new file mode 100644 index 00000000000..38202305491 --- /dev/null +++ b/TAO/tests/ForwardOnceUponException/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/ForwardOnceUponException/README b/TAO/tests/ForwardOnceUponException/README index 4cdcc019b01..7f6280c3d6a 100644 --- a/TAO/tests/ForwardOnceUponException/README +++ b/TAO/tests/ForwardOnceUponException/README @@ -1,7 +1,5 @@ /** - - @page ForwardOnceOnException Test README File This is test for feature of request forwarding ONCE when client diff --git a/TAO/tests/ForwardUponObjectNotExist/.gitignore b/TAO/tests/ForwardUponObjectNotExist/.gitignore new file mode 100644 index 00000000000..38202305491 --- /dev/null +++ b/TAO/tests/ForwardUponObjectNotExist/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Forwarding/.gitignore b/TAO/tests/Forwarding/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/Forwarding/.gitignore +++ b/TAO/tests/Forwarding/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/.gitignore b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/.gitignore index 06845b19f52..41f66e96d8f 100644 --- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/.gitignore +++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/.gitignore @@ -1 +1,6 @@ /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/HandleExhaustion/.gitignore b/TAO/tests/HandleExhaustion/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/HandleExhaustion/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Hang_Shutdown/.gitignore b/TAO/tests/Hang_Shutdown/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Hang_Shutdown/.gitignore +++ b/TAO/tests/Hang_Shutdown/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/ICMG_Any_Bug/.gitignore b/TAO/tests/ICMG_Any_Bug/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/ICMG_Any_Bug/.gitignore +++ b/TAO/tests/ICMG_Any_Bug/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/IDL_Inherited_Operation/.gitignore b/TAO/tests/IDL_Inherited_Operation/.gitignore new file mode 100644 index 00000000000..1048d4d583a --- /dev/null +++ b/TAO/tests/IDL_Inherited_Operation/.gitignore @@ -0,0 +1,7 @@ +/client +/InheritedOpC.cpp +/InheritedOpC.h +/InheritedOpC.inl +/InheritedOpS.cpp +/InheritedOpS.h +/server diff --git a/TAO/tests/IDLv4/TestIDLv4.idl b/TAO/tests/IDLv4/TestIDLv4.idl index d46d65705e7..614536616df 100644 --- a/TAO/tests/IDLv4/TestIDLv4.idl +++ b/TAO/tests/IDLv4/TestIDLv4.idl @@ -77,6 +77,8 @@ struct TestAnon { // 7.4.15.4.2 Applying Annotations +const double dub = 6.78; + @abc struct Annotated1 { @@ -89,11 +91,10 @@ struct Annotated1 { @aa(L"bbcc") octet g; @ddee(4 + 5) octet h; - const double dub = 6.78; @ffgg(dub) octet i; @hhii(jj = FALSE) octet j; - @kkll(mm = 3, nn = 'oo') octet k; + @kkll(mm = 3, nn = 'o') octet k; }; @bit_bound(8) diff --git a/TAO/tests/IDLv4/annotations/Annotation_Test.cpp b/TAO/tests/IDLv4/annotations/Annotation_Test.cpp index d3fb4e46fe6..e12dc670b93 100644 --- a/TAO/tests/IDLv4/annotations/Annotation_Test.cpp +++ b/TAO/tests/IDLv4/annotations/Annotation_Test.cpp @@ -1,11 +1,12 @@ #include "Annotation_Test.h" +#include <global_extern.h> + unsigned Annotation_Test::failed_test_count_ = 0; unsigned Annotation_Test::total_test_count_ = 0; -Annotation_Test::Annotation_Test (const char *name) +Annotation_Test::Annotation_Test (const std::string &name) : name_ (name), - idl_ (0), failed_ (false), error_count_ (0), last_error_ (UTL_Error::EIDL_OK), @@ -22,31 +23,38 @@ Annotation_Test::~Annotation_Test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Annotation Test: %C: ") - ACE_TEXT ("FAILED because of syntax error in:\n%C\n") + ACE_TEXT ("FAILED because of syntax error in:\n"), + name_.c_str ())); + + print_idl_with_line_numbers (); + + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Check syntax error message above for more information.\n"), - ACE_TEXT ("Failures beyond this might be false positives.\n"), - name_, idl_)); + ACE_TEXT ("Failures beyond this might be false positives.\n"))); ++failed_test_count_; } else if (!failed_) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Annotation Test: %C: PASSED\n"), name_)); + ACE_TEXT ("Annotation Test: %C: PASSED\n"), name_.c_str ())); } + + idl_global->err ()->reset_last_error_and_warning (); } void -Annotation_Test::failed (const char *message) +Annotation_Test::failed (const std::string &message) { - if (message) + if (message.length ()) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Annotation Test Error: %C: %C\n"), - name_, message)); + name_.c_str (), message.c_str ())); } ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Annotation Test: %C: FAILED\nFailed IDL:\n%C\n"), - name_, idl_)); + ACE_TEXT ("Annotation Test: %C: FAILED\nFailed IDL:\n"), + name_.c_str ())); + print_idl_with_line_numbers (); failed_test_count_++; failed_ = true; throw Failed (); @@ -73,9 +81,8 @@ Annotation_Test::last_warning (UTL_Error::ErrorCode last_warning) return *this; } - Annotation_Test & -Annotation_Test::run (const char *idl) +Annotation_Test::run (const std::string &idl) { // Reset Error State idl_global->set_err_count (0); @@ -84,7 +91,7 @@ Annotation_Test::run (const char *idl) // Eval IDL idl_ = idl; - idl_global->eval (idl, disable_output_); + idl_global->eval (idl.c_str (), disable_output_); // Look at Results if (idl_global->err_count () != error_count_) @@ -92,7 +99,7 @@ Annotation_Test::run (const char *idl) failed_ = true; ACE_ERROR ((LM_ERROR, ACE_TEXT ("Annotation Test Error: %C:\nError Count: expecting %d, got %d!\n"), - name_, error_count_, idl_global->err_count ())); + name_.c_str (), error_count_, idl_global->err_count ())); } if (idl_global->err ()->last_error != last_error_) { @@ -100,7 +107,7 @@ Annotation_Test::run (const char *idl) ACE_ERROR ((LM_ERROR, ACE_TEXT ("Annotation Test Error: %C:\n") ACE_TEXT ("Last Error Code (UTL_Error::ErrorCode): expecting "), - name_)); + name_.c_str ())); if (last_error_ == UTL_Error::EIDL_OK) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("OK"))); @@ -127,7 +134,7 @@ Annotation_Test::run (const char *idl) ACE_ERROR ((LM_ERROR, ACE_TEXT ("Annotation Test Error: %C:\n") ACE_TEXT ("Last Warning Code (UTL_Error::ErrorCode): expecting "), - name_)); + name_.c_str ())); if (last_warning_ == UTL_Error::EIDL_OK) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("OK"))); @@ -174,7 +181,7 @@ Annotation_Test::assert_node (const char *name, UTL_Scope *from) ACE_ERROR ((LM_ERROR, ACE_TEXT ("Annotation Test Error: %C:\n") ACE_TEXT ("Failed to Find AST Node named %C!\n"), - name_, name)); + name_.c_str (), name)); failed (); } @@ -187,7 +194,6 @@ Annotation_Test::assert_node (const char *name, UTL_Scope *from) return node; } - AST_Annotation_Decl * Annotation_Test::assert_annotation_decl (const char *name) { @@ -198,7 +204,7 @@ Annotation_Test::assert_annotation_decl (const char *name) ACE_ERROR ((LM_ERROR, ACE_TEXT ("Annotation Test Error: %C:\n") ACE_TEXT ("AST Node named %C is not an AST_Annotation_Decl!\n"), - name_, name)); + name_.c_str (), name)); failed (); } @@ -215,8 +221,8 @@ Annotation_Test::assert_annotation_appl_count ( char *node_name = node->name ()->get_string_copy (); ACE_ERROR ((LM_ERROR, ACE_TEXT ("Annotation Test Error: %C:\n") - ACE_TEXT ("asserting %C has %d annotations, but there are %d!\n"), - name_, node_name, count, annotations.size ())); + ACE_TEXT ("asserted that %C has %d annotation(s), but there are %d!\n"), + name_.c_str (), node_name, count, annotations.size ())); delete [] node_name; failed (); } @@ -231,7 +237,7 @@ Annotation_Test::assert_annotation_appl ( ACE_ERROR ((LM_ERROR, ACE_TEXT ("Annotation Test Error: %C:\n") ACE_TEXT ("assert_annotation_appl: annotation decl is null!\n"), - name_)); + name_.c_str ())); failed (); } @@ -243,7 +249,7 @@ Annotation_Test::assert_annotation_appl ( ACE_TEXT ("Annotation Test Error: %C:\n") ACE_TEXT ("can not access %C annotation %d, ") ACE_TEXT ("it has no annotations!\n"), - name_, node_name, index)); + name_.c_str (), node_name, index)); delete [] node_name; failed (); } @@ -255,7 +261,7 @@ Annotation_Test::assert_annotation_appl ( ACE_TEXT ("Annotation Test Error: %C:\n") ACE_TEXT ("can not access %C annotation %d, ") ACE_TEXT ("it only has %d annotation(s)!\n"), - name_, node_name, index, annotations.size ())); + name_.c_str (), node_name, index, annotations.size ())); delete [] node_name; failed (); } @@ -267,7 +273,7 @@ Annotation_Test::assert_annotation_appl ( ACE_ERROR ((LM_ERROR, ACE_TEXT ("Annotation Test Error: %C:\n") ACE_TEXT ("%C annotation %d is null!\n"), - name_, node_name, index)); + name_.c_str (), node_name, index)); delete [] node_name; failed (); } @@ -279,7 +285,7 @@ Annotation_Test::assert_annotation_appl ( ACE_ERROR ((LM_ERROR, ACE_TEXT ("Annotation Test Error: %C:\n") ACE_TEXT ("%C annotation %d is a %C, looking for a %C!\n"), - name_, node_name, index, anno_appl_name, anno_decl_name)); + name_.c_str (), node_name, index, anno_appl_name, anno_decl_name)); delete [] anno_appl_name; delete [] anno_decl_name; delete [] node_name; @@ -298,7 +304,7 @@ Annotation_Test::assert_annotation_member_count ( ACE_ERROR ((LM_ERROR, ACE_TEXT ("Annotation Test Error: %C:\n") ACE_TEXT ("assert_annotation_member_count: annotation decl is null!\n"), - name_)); + name_.c_str ())); failed (); } @@ -309,7 +315,7 @@ Annotation_Test::assert_annotation_member_count ( ACE_ERROR ((LM_ERROR, ACE_TEXT ("Annotation Test Error: %C:\n") ACE_TEXT ("%C should have %d members, but it actually has %d!\n"), - name_, anno_decl_name, count, actual_count)); + name_.c_str (), anno_decl_name, count, actual_count)); delete [] anno_decl_name; failed (); } @@ -335,13 +341,12 @@ Annotation_Test::get_annotation_member ( ACE_ERROR ((LM_ERROR, ACE_TEXT ("Annotation Test Error: %C:\n") ACE_TEXT ("Could not get annotation member %C!\n"), - name_, name)); + name_.c_str (), name)); failed (); } return member; } - AST_Annotation_Member * Annotation_Test::get_annotation_member ( AST_Annotation_Appl *anno_appl, const char *name) @@ -361,7 +366,7 @@ Annotation_Test::assert_annotation_member_type ( ACE_TEXT ("Annotation Test Error: %C:\n") ACE_TEXT ("For Annotation Member %C, ") ACE_TEXT ("expecting it to be a %C, but it is a %C!\n"), - name_, member_name, + name_.c_str (), member_name, AST_Expression::exprtype_to_string (type), AST_Expression::exprtype_to_string (member->expr_type ()))); delete [] member_name; @@ -381,7 +386,7 @@ Annotation_Test::assert_annotation_member_value ( ACE_TEXT ("Annotation Test Error: %C:\n") ACE_TEXT ("For Annotation Member %C, ") ACE_TEXT ("expecting it to have a value, but it doesn't!\n"), - name_, member_name)); + name_.c_str (), member_name)); delete [] member_name; failed (); } @@ -393,7 +398,7 @@ Annotation_Test::assert_annotation_member_value ( ACE_TEXT ("Annotation Test Error: %C:\n") ACE_TEXT ("For Annotation Member %C, ") ACE_TEXT ("expected value is null, can't compare!\n"), - name_, member_name)); + name_.c_str (), member_name)); delete [] member_name; failed (); } @@ -410,14 +415,13 @@ Annotation_Test::assert_annotation_member_value ( equal = (*expected) == member_value; } - if (!equal) { char *member_name = member->name ()->get_string_copy (); ACE_ERROR ((LM_ERROR, ACE_TEXT ("Annotation Test Error: %C:\n") ACE_TEXT ("For Annotation Member %C, expecting "), - name_, member_name)); + name_.c_str (), member_name)); delete [] member_name; expected->dump (*ACE_DEFAULT_LOG_STREAM); ACE_ERROR ((LM_ERROR, ACE_TEXT (", got "))); @@ -438,7 +442,7 @@ Annotation_Test::assert_annotation_member_no_value (AST_Annotation_Member *membe ACE_TEXT ("Annotation Test Error: %C:\n") ACE_TEXT ("For Annotation Member %C, ") ACE_TEXT ("expecting it to not have a value, but it does!\n"), - name_, member_name)); + name_.c_str (), member_name)); delete [] member_name; failed (); } @@ -453,7 +457,7 @@ Annotation_Test::set_scope (AST_Decl *scope_node) ACE_ERROR ((LM_ERROR, ACE_TEXT ("Annotation Test Error: %C:\n") ACE_TEXT ("Node passed to set_scope isn't a valid UTL_Scope!\n"), - name_)); + name_.c_str ())); failed (); } } @@ -481,3 +485,40 @@ Annotation_Test::results () } idl_global->set_err_count (failed_test_count_); } + +void +Annotation_Test::print_idl_with_line_numbers () +{ + static const char* start_marker = +#ifndef ACE_WIN32 + "\x1b[31m" +#endif + ">"; + static const char* end_marker = +#ifndef ACE_WIN32 + "\x1b[0m" +#endif + ""; + const long last_error_line = idl_global->err ()->last_error_lineno; + const long marked_line = last_error_line != -1 ? + last_error_line : idl_global->err ()->last_warning_lineno; + const size_t char_count = idl_.length (); + + long line_number = 0; + for (size_t start = 0; start < char_count;) + { + ++line_number; + const size_t end = idl_.find ('\n', start); + const std::string line = idl_.substr (start, end - start); + const bool mark_line = line_number == marked_line; + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("%C%4u: %C%C\n"), + mark_line ? start_marker : " ", + line_number, line.c_str (), + mark_line ? end_marker : "")); + if (end == std::string::npos) { + break; + } + start = end + 1; + } +} diff --git a/TAO/tests/IDLv4/annotations/Annotation_Test.h b/TAO/tests/IDLv4/annotations/Annotation_Test.h index d504b13c373..d5e351c0dd4 100644 --- a/TAO/tests/IDLv4/annotations/Annotation_Test.h +++ b/TAO/tests/IDLv4/annotations/Annotation_Test.h @@ -1,32 +1,33 @@ -#include "ace/OS_NS_stdlib.h" -#include "ace/OS_NS_string.h" -#include "ace/OS_NS_stdio.h" - +#include <ast_annotation_decl.h> +#include <ast_annotation_member.h> +#include <utl_identifier.h> +#include <ast_generator.h> +#include <utl_scope.h> +#include <fe_declarator.h> +#include <ast_field.h> +#include <ast_typedef.h> +#include <ast_sequence.h> +#include <ast_union.h> +#include <ast_enum_val.h> +#include <utl_string.h> +#include <ast_array.h> +#include <ast_interface.h> + +#include <ace/OS_NS_stdlib.h> +#include <ace/OS_NS_string.h> +#include <ace/OS_NS_stdio.h> #ifndef ACE_LACKS_IOSTREAM_TOTALLY -# include "ace/streams.h" +# include <ace/streams.h> #endif -#include "ast_annotation_decl.h" -#include "ast_annotation_member.h" -#include "utl_identifier.h" -#include "ast_generator.h" -#include "utl_scope.h" -#include "fe_declarator.h" -#include "ast_field.h" -#include "ast_typedef.h" -#include "ast_sequence.h" -#include "ast_union.h" -#include "ast_enum_val.h" -#include "utl_string.h" -#include "ast_array.h" -#include "ast_interface.h" +#include <string> struct Failed {}; class Annotation_Test { public: - const char *name_; - const char *idl_; + std::string name_; + std::string idl_; bool failed_; int error_count_; UTL_Error::ErrorCode last_error_, last_warning_; @@ -36,11 +37,11 @@ public: static unsigned failed_test_count_; static unsigned total_test_count_; - explicit Annotation_Test (const char *name); + explicit Annotation_Test (const std::string &name); ~Annotation_Test (); - void failed (const char *message = 0); + void failed (const std::string &message = ""); Annotation_Test &error_count (int error_count); @@ -48,21 +49,22 @@ public: Annotation_Test &last_warning (UTL_Error::ErrorCode last_warning); - Annotation_Test &run (const char *idl); + Annotation_Test &run (const std::string &idl); AST_Decl *assert_node (const char *name, UTL_Scope *from = 0); template <typename T> T *assert_node (const char *name, UTL_Scope *from = 0) { - T *cast = dynamic_cast<T*> (assert_node (name, from)); - if (!cast) { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Annotation Test Error: %C:\n") - ACE_TEXT ("assert_node: Failed to cast node to requested type!\n"), - name_)); - failed (); - } + T *cast = dynamic_cast<T *> (assert_node (name, from)); + if (!cast) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Annotation Test Error: %C:\n") + ACE_TEXT ("assert_node: Failed to cast node to requested type!\n"), + name_.c_str ())); + failed (); + } return cast; } @@ -105,5 +107,7 @@ public: void disable_output (); + void print_idl_with_line_numbers (); + static void results (); }; diff --git a/TAO/tests/IDLv4/annotations/README.md b/TAO/tests/IDLv4/annotations/README.md index 6d72e80db1a..fdebfe87ca7 100644 --- a/TAO/tests/IDLv4/annotations/README.md +++ b/TAO/tests/IDLv4/annotations/README.md @@ -2,4 +2,5 @@ This is a instance of the `tao_idl` compiler that doesn't produces any output and just verifies annotations can be defined and read by the backend and that -annotation data is correct. This testing is taking place in `be_init.cpp`. +annotation data is correct. This testing is taking place in +`annotation_tests.cpp`. diff --git a/TAO/tests/IDLv4/annotations/annotation_tests.cpp b/TAO/tests/IDLv4/annotations/annotation_tests.cpp index 6c383cbbe01..73b2359c178 100644 --- a/TAO/tests/IDLv4/annotations/annotation_tests.cpp +++ b/TAO/tests/IDLv4/annotations/annotation_tests.cpp @@ -1,5 +1,112 @@ #include "Annotation_Test.h" +#include <ast_valuetype.h> +#include <ast_porttype.h> +#include <ast_eventtype.h> +#include <ast_component.h> + +#include <string> + +namespace { + + void assert_node_has_annotation ( + Annotation_Test &t, const char *node_name, AST_Annotation_Decl *annotation) + { + AST_Decl *node = t.assert_node (node_name); + t.assert_annotation_appl_count (node, 1); + t.assert_annotation_appl (node, 0, annotation); + } + + /** + * Common Test IDL for what the IDL4 grammer calls "attr_dcl" + */ + const std::string common_attr_dcl_idl = + " @test_annotation_1\n" + " attribute short rw_attribute;\n" + " @test_annotation_1\n" + " readonly attribute short ro_attribute;\n"; + + void assert_common_attr_dcl_idl ( + Annotation_Test &t, AST_Annotation_Decl *test_annotation_1) + { + assert_node_has_annotation (t, "rw_attribute", test_annotation_1); + assert_node_has_annotation (t, "ro_attribute", test_annotation_1); + } + + /** + * Common Test IDL for what the IDL4 grammer calls "export" + */ + const std::string common_export_idl = + // op_dcl + " @test_annotation_1\n" + " void operation();\n" + // attr_decl + + common_attr_dcl_idl + + // type_dcl + " @test_annotation_1\n" + " struct struct_in_export {\n" + " short value;\n" + " };\n" + // const_dcl + " @test_annotation_1\n" + " const short const_value = 3;\n" + // except_dcl + " @test_annotation_1\n" + " exception exception_in_export {\n" + " short value;\n" + " };\n" + // Use expection + " @test_annotation_1\n" + " void operation_with_exception() raises (exception_in_export);\n" + // type_id_dcl (Doesn't work) + // type_prefix_dcl (No grammar issues, but a type_prefix isn't something + // that's part of the AST, so I'm not sure how this would work). + // " @test_annotation_1\n" + // " typeprefix struct_in_export \"electric_plants\";\n" + // import_dcl (TAO_IDL has import as a keyword, but doesn't support it in the grammer) + // op_oneway_dcl + " @test_annotation_1\n" + " oneway void oneway_op();\n"; + + void assert_common_export_idl ( + Annotation_Test &t, AST_Annotation_Decl *test_annotation_1) + { + assert_node_has_annotation (t, "operation", test_annotation_1); + assert_common_attr_dcl_idl (t, test_annotation_1); + assert_node_has_annotation (t, "struct_in_export", test_annotation_1); + assert_node_has_annotation (t, "const_value", test_annotation_1); + assert_node_has_annotation (t, "exception_in_export", test_annotation_1); + assert_node_has_annotation (t, "operation_with_exception", test_annotation_1); + assert_node_has_annotation (t, "oneway_op", test_annotation_1); + } + + /** + * Common Test IDL for what the IDL4 grammer calls "value_element" + */ + const std::string common_value_element_idl = + // export + common_export_idl + + + // state_member + " @test_annotation_1\n" + " public short public_state_member;\n" + " @test_annotation_1\n" + " private short private_state_member;\n" + + // init_dcl + " @test_annotation_1\n" + " factory factory_thing();\n"; + + void assert_common_value_element_idl ( + Annotation_Test &t, AST_Annotation_Decl *test_annotation_1) + { + assert_common_export_idl (t, test_annotation_1); + assert_node_has_annotation (t, "public_state_member", test_annotation_1); + assert_node_has_annotation (t, "private_state_member", test_annotation_1); + assert_node_has_annotation (t, "factory_thing", test_annotation_1); + } +} + /* * Notes About These Tests * ========================================================================= @@ -312,7 +419,7 @@ annotation_tests () ACE_ERROR ((LM_ERROR, ACE_TEXT ("Annotation Test Error: %C:\n") ACE_TEXT ("expected one annotation on test_seq_t base type, ") ACE_TEXT ("it has %d annotations!\n"), - t.name_, count)); + t.name_.c_str (), count)); t.failed (); } AST_Annotation_Appl *annotation = annotations[0]; @@ -328,7 +435,7 @@ annotation_tests () ACE_ERROR ((LM_ERROR, ACE_TEXT ("Annotation Test Error: %C:\n") ACE_TEXT ("expected annotation for test_seq_t base type to be ") ACE_TEXT ("test_annotation_1, but it was %C\n"), - t.name_, name)); + t.name_.c_str (), name)); if (scopedname) { delete [] name; @@ -442,7 +549,7 @@ annotation_tests () ACE_ERROR ((LM_ERROR, ACE_TEXT ("Annotation Test Error: %C:\n") ACE_TEXT ("expected one annotation on test_union discriminator, ") ACE_TEXT ("it has %d annotations!\n"), - t.name_, count)); + t.name_.c_str (), count)); t.failed (); } AST_Annotation_Appl *annotation = annotations[0]; @@ -458,7 +565,7 @@ annotation_tests () ACE_ERROR ((LM_ERROR, ACE_TEXT ("Annotation Test Error: %C:\n") ACE_TEXT ("expected annotation for test_union discriminator to be ") ACE_TEXT ("test_annotation_1, but it was %C\n"), - t.name_, name)); + t.name_.c_str (), name)); if (scopedname) { delete [] name; @@ -512,7 +619,7 @@ annotation_tests () try { idl_global->unknown_annotations_ = IDL_GlobalData::UNKNOWN_ANNOTATIONS_ERROR; - Annotation_Test t ("Optionally, Unknown Annotation Application Causes Err"); + Annotation_Test t ("Optionally, Unknown Annotation Application Causes Err0r"); // Any mention of "Error" will be picked up by scoreboard ^^^ t.last_error (UTL_Error::EIDL_LOOKUP_ERROR).error_count (1); t.disable_output (); @@ -634,7 +741,7 @@ annotation_tests () ACE_ERROR ((LM_ERROR, ACE_TEXT ("Annotation Test Error: %C:\n") ACE_TEXT ("expected one annotation on struct12Array base type, ") ACE_TEXT ("it has %d annotations!\n"), - t.name_, count)); + t.name_.c_str (), count)); t.failed (); } AST_Annotation_Appl *annotation = annotations[0]; @@ -650,7 +757,7 @@ annotation_tests () ACE_ERROR ((LM_ERROR, ACE_TEXT ("Annotation Test Error: %C:\n") ACE_TEXT ("expected annotation for struct12Array base type to be ") ACE_TEXT ("test_annotation_1, but it was %C\n"), - t.name_, name)); + t.name_.c_str (), name)); if (scopedname) { delete [] name; @@ -717,49 +824,130 @@ annotation_tests () try { Annotation_Test t ("Annotations on and in Interfaces"); - t.run ( + t.run ((std::string () + "@test_annotation_1\n" "interface interface1 {\n" - " @test_annotation_1\n" - " struct struct_in_interface1 {\n" - " short value;\n" - " };\n" - " @test_annotation_1\n" - " void operation();\n" - " @test_annotation_1\n" - " const short const_value = 3;\n" - " @test_annotation_1\n" - " attribute short rw_attribute;\n" - " @test_annotation_1\n" - " readonly attribute short ro_attribute;\n" + // export + + common_export_idl + "};\n" - ); + ).c_str ()); AST_Interface *interface1 = t.assert_node<AST_Interface> ("interface1"); t.assert_annotation_appl_count (interface1, 1); t.assert_annotation_appl (interface1, 0, test_annotation_1); - t.set_scope (interface1); + assert_common_export_idl (t, test_annotation_1); + } catch (Failed const &) {} - AST_Decl *struct_in_interface1 = t.assert_node ("struct_in_interface1"); - t.assert_annotation_appl_count (struct_in_interface1, 1); - t.assert_annotation_appl (struct_in_interface1, 0, test_annotation_1); + try { + Annotation_Test t ("Annotations on and in Valuetypes"); + t.run ((std::string () + + "@test_annotation_1\n" + "valuetype valuetype1 {\n" + // value_element + + common_value_element_idl + + "};\n" + ).c_str ()); - AST_Decl *operation = t.assert_node ("operation"); - t.assert_annotation_appl_count (operation, 1); - t.assert_annotation_appl (operation, 0, test_annotation_1); + AST_ValueType *valuetype1 = t.assert_node<AST_ValueType> ("valuetype1"); + t.assert_annotation_appl_count (valuetype1, 1); + t.assert_annotation_appl (valuetype1, 0, test_annotation_1); + t.set_scope (valuetype1); + assert_common_value_element_idl (t, test_annotation_1); + } catch (Failed const &) {} - AST_Decl *const_value = t.assert_node ("const_value"); - t.assert_annotation_appl_count (const_value, 1); - t.assert_annotation_appl (const_value, 0, test_annotation_1); + try { + Annotation_Test t ("Annotations on and in Porttypes"); + t.run ((std::string () + + "@test_annotation_1\n" + "porttype port_with_provides {\n" + // port_ref + " @test_annotation_1\n" + " provides interface1 provides_value;\n" + // port_export + + common_attr_dcl_idl + + "};\n" + "\n" + "@test_annotation_1\n" + "porttype port_with_uses {\n" + // port_ref + " @test_annotation_1\n" + " uses interface1 uses_value;\n" + // port_export + + common_attr_dcl_idl + + "};\n" + ).c_str ()); + + AST_PortType *port_with_provides = + t.assert_node<AST_PortType> ("port_with_provides"); + t.assert_annotation_appl_count (port_with_provides, 1); + t.assert_annotation_appl (port_with_provides, 0, test_annotation_1); + t.set_scope (port_with_provides); + assert_node_has_annotation (t, "provides_value", test_annotation_1); + assert_common_attr_dcl_idl (t, test_annotation_1); + + AST_PortType *port_with_uses = + t.assert_node<AST_PortType> ("port_with_uses"); + t.assert_annotation_appl_count (port_with_uses, 1); + t.assert_annotation_appl (port_with_uses, 0, test_annotation_1); + t.set_scope (port_with_uses); + assert_node_has_annotation (t, "uses_value", test_annotation_1); + assert_common_attr_dcl_idl (t, test_annotation_1); + } catch (Failed const &) {} - AST_Decl *rw_attribute = t.assert_node ("rw_attribute"); - t.assert_annotation_appl_count (rw_attribute, 1); - t.assert_annotation_appl (rw_attribute, 0, test_annotation_1); + try { + Annotation_Test t ("Annotations on and in Eventtypes"); + t.run ((std::string () + + "@test_annotation_1\n" + "eventtype event1 {\n" + + common_value_element_idl + + "};\n" + ).c_str ()); + AST_EventType *event1 = t.assert_node<AST_EventType> ("event1"); + t.assert_annotation_appl_count (event1, 1); + t.assert_annotation_appl (event1, 0, test_annotation_1); + t.set_scope (event1); + assert_common_value_element_idl (t, test_annotation_1); + } catch (Failed const &) {} - AST_Decl *ro_attribute = t.assert_node ("ro_attribute"); - t.assert_annotation_appl_count (ro_attribute, 1); - t.assert_annotation_appl (ro_attribute, 0, test_annotation_1); + try { + Annotation_Test t ("Annotations on and in Components"); + t.run ((std::string () + + "@test_annotation_1\n" + "component component1 {\n" + // provides_dcl + " @test_annotation_1\n" + " provides interface1 provides_value;\n" + // uses_dcl + " @test_annotation_1\n" + " uses interface1 uses_value;\n" + // attr_dcl + + common_attr_dcl_idl + + // port_dcl + " @test_annotation_1\n" + " port port_with_uses port_value;\n" + // emits_dcl + " @test_annotation_1\n" + " emits event1 emits_value;\n" + // publishes_dcl + " @test_annotation_1\n" + " publishes event1 publishes_value;\n" + // consumes_dcl + " @test_annotation_1\n" + " consumes event1 consumes_value;\n" + "};\n" + ).c_str ()); + AST_Component *component1 = t.assert_node<AST_Component> ("component1"); + t.assert_annotation_appl_count (component1, 1); + t.assert_annotation_appl (component1, 0, test_annotation_1); + t.set_scope (component1); + assert_node_has_annotation (t, "provides_value", test_annotation_1); + assert_node_has_annotation (t, "uses_value", test_annotation_1); + assert_common_attr_dcl_idl (t, test_annotation_1); + assert_node_has_annotation (t, "port_value", test_annotation_1); + assert_node_has_annotation (t, "emits_value", test_annotation_1); + assert_node_has_annotation (t, "publishes_value", test_annotation_1); + assert_node_has_annotation (t, "consumes_value", test_annotation_1); } catch (Failed const &) {} /* @@ -796,7 +984,7 @@ annotation_tests () AST_Annotation_Decl *range_like_test_annotation = t.assert_annotation_decl ("::@range_test_annotation"); - AST_Decl *RangedFloat = t.assert_node( + AST_Decl *RangedFloat = t.assert_node ( "::range_test_annoation_module::RangedFloat"); t.assert_annotation_appl_count (RangedFloat, 3); t.assert_annotation_appl (RangedFloat, 0, range_like_test_annotation); diff --git a/TAO/tests/IDLv4/anonymous_types/.gitignore b/TAO/tests/IDLv4/anonymous_types/.gitignore new file mode 100644 index 00000000000..e1555c28d5a --- /dev/null +++ b/TAO/tests/IDLv4/anonymous_types/.gitignore @@ -0,0 +1,5 @@ +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/IDLv4/anonymous_types/IDLv4_anonymous_types.mpc b/TAO/tests/IDLv4/anonymous_types/IDLv4_anonymous_types.mpc new file mode 100644 index 00000000000..e16cb118748 --- /dev/null +++ b/TAO/tests/IDLv4/anonymous_types/IDLv4_anonymous_types.mpc @@ -0,0 +1,6 @@ +project: taoexe { + idlflags += --idl-version 4 + IDL_Files { + test.idl + } +} diff --git a/TAO/tests/IDLv4/anonymous_types/test.idl b/TAO/tests/IDLv4/anonymous_types/test.idl new file mode 100644 index 00000000000..eee64242483 --- /dev/null +++ b/TAO/tests/IDLv4/anonymous_types/test.idl @@ -0,0 +1,25 @@ +/* + * This is just a simple test making sure anonymous types work in IDL4 since + * there is already a test file at tests/IDL_Test/anonymous.idl. + */ + +struct TestStruct { + short short_array[10]; + short another_short_array[10]; + sequence<long> long_sequence; + sequence<long> another_long_sequence; + sequence<long, 3> bounded_long_sequence; + sequence<long, 3> another_bounded_long_sequence; +}; + +// Another struct, different lengths +struct AnotherTestStruct { + short short_array[9]; + short another_short_array[9]; + short another_short_10_array[10]; + sequence<long> long_sequence; + sequence<long> another_long_sequence; + sequence<long, 4> bounded_long_sequence; + sequence<long, 4> another_bounded_long_sequence; + sequence<long, 3> another_bounded_3_long_sequence; +}; diff --git a/TAO/tests/IORManipulation/filter/.gitignore b/TAO/tests/IORManipulation/filter/.gitignore new file mode 100644 index 00000000000..41f66e96d8f --- /dev/null +++ b/TAO/tests/IORManipulation/filter/.gitignore @@ -0,0 +1,6 @@ +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/IORTable_Locator/.gitignore b/TAO/tests/IORTable_Locator/.gitignore new file mode 100644 index 00000000000..66bb5a17255 --- /dev/null +++ b/TAO/tests/IORTable_Locator/.gitignore @@ -0,0 +1,8 @@ +/async_server +/client +/server +/simple_testC.cpp +/simple_testC.h +/simple_testC.inl +/simple_testS.cpp +/simple_testS.h diff --git a/TAO/tests/IOR_Endpoint_Hostnames/.gitignore b/TAO/tests/IOR_Endpoint_Hostnames/.gitignore index 3d3c3c1c63f..6c8bdf5dd4d 100644 --- a/TAO/tests/IOR_Endpoint_Hostnames/.gitignore +++ b/TAO/tests/IOR_Endpoint_Hostnames/.gitignore @@ -1,2 +1,7 @@ +/bogusC.cpp +/bogusC.h +/bogusC.inl +/bogusS.cpp +/bogusS.h /generate_ior /list_interfaces diff --git a/TAO/tests/IPV6/.gitignore b/TAO/tests/IPV6/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/IPV6/.gitignore +++ b/TAO/tests/IPV6/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/InterOp-Naming/.gitignore b/TAO/tests/InterOp-Naming/.gitignore index e9f615730ed..57c16fa61c1 100644 --- a/TAO/tests/InterOp-Naming/.gitignore +++ b/TAO/tests/InterOp-Naming/.gitignore @@ -1,2 +1,7 @@ /INS_test_client /INS_test_server +/INSC.cpp +/INSC.h +/INSC.inl +/INSS.cpp +/INSS.h diff --git a/TAO/tests/Leader_Followers/.gitignore b/TAO/tests/Leader_Followers/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/Leader_Followers/.gitignore +++ b/TAO/tests/Leader_Followers/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/LongDouble/.gitignore b/TAO/tests/LongDouble/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/LongDouble/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/LongUpcalls/.gitignore b/TAO/tests/LongUpcalls/.gitignore index e8bdc22288c..a385201b97a 100644 --- a/TAO/tests/LongUpcalls/.gitignore +++ b/TAO/tests/LongUpcalls/.gitignore @@ -2,3 +2,8 @@ /ami_server /blocking_client /blocking_server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/MProfile/.gitignore b/TAO/tests/MProfile/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/MProfile/.gitignore +++ b/TAO/tests/MProfile/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/MProfile_Connection_Timeout/.gitignore b/TAO/tests/MProfile_Connection_Timeout/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/MProfile_Connection_Timeout/.gitignore +++ b/TAO/tests/MProfile_Connection_Timeout/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/MProfile_Forwarding/.gitignore b/TAO/tests/MProfile_Forwarding/.gitignore index 1e9d2a4c751..501e057ec8c 100644 --- a/TAO/tests/MProfile_Forwarding/.gitignore +++ b/TAO/tests/MProfile_Forwarding/.gitignore @@ -1,4 +1,9 @@ -/Manager /client +/Manager /manager /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/MT_BiDir/.gitignore b/TAO/tests/MT_BiDir/.gitignore index 3d33a15f751..4b862a28e92 100644 --- a/TAO/tests/MT_BiDir/.gitignore +++ b/TAO/tests/MT_BiDir/.gitignore @@ -1,2 +1,12 @@ /client +/ReceiverC.cpp +/ReceiverC.h +/ReceiverC.inl +/ReceiverS.cpp +/ReceiverS.h +/SenderC.cpp +/SenderC.h +/SenderC.inl +/SenderS.cpp +/SenderS.h /server diff --git a/TAO/tests/MT_Client/.gitignore b/TAO/tests/MT_Client/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/MT_Client/.gitignore +++ b/TAO/tests/MT_Client/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/.gitignore b/TAO/tests/MT_NoUpcall_Client_Leader/.gitignore new file mode 100644 index 00000000000..7ae81ee408b --- /dev/null +++ b/TAO/tests/MT_NoUpcall_Client_Leader/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/SharedIntfC.cpp +/SharedIntfC.h +/SharedIntfC.inl +/SharedIntfS.cpp +/SharedIntfS.h diff --git a/TAO/tests/MT_NoUpcall_Connect/.gitignore b/TAO/tests/MT_NoUpcall_Connect/.gitignore new file mode 100644 index 00000000000..7ae81ee408b --- /dev/null +++ b/TAO/tests/MT_NoUpcall_Connect/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/SharedIntfC.cpp +/SharedIntfC.h +/SharedIntfC.inl +/SharedIntfS.cpp +/SharedIntfS.h diff --git a/TAO/tests/MT_Server/.gitignore b/TAO/tests/MT_Server/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/MT_Server/.gitignore +++ b/TAO/tests/MT_Server/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/MT_Timeout/.gitignore b/TAO/tests/MT_Timeout/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/MT_Timeout/.gitignore +++ b/TAO/tests/MT_Timeout/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Mixed_Sync_ASync_Events/.gitignore b/TAO/tests/Mixed_Sync_ASync_Events/.gitignore new file mode 100644 index 00000000000..7d3edab2d1e --- /dev/null +++ b/TAO/tests/Mixed_Sync_ASync_Events/.gitignore @@ -0,0 +1,6 @@ +/testC.cpp +/testC.h +/testC.inl +/tester +/testS.cpp +/testS.h diff --git a/TAO/tests/Monitor/Marshal_Buffer/.gitignore b/TAO/tests/Monitor/Marshal_Buffer/.gitignore new file mode 100644 index 00000000000..38202305491 --- /dev/null +++ b/TAO/tests/Monitor/Marshal_Buffer/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Multiple/.gitignore b/TAO/tests/Multiple/.gitignore index 3d33a15f751..561be2c2546 100644 --- a/TAO/tests/Multiple/.gitignore +++ b/TAO/tests/Multiple/.gitignore @@ -1,2 +1,7 @@ /client +/MultipleC.cpp +/MultipleC.h +/MultipleC.inl +/MultipleS.cpp +/MultipleS.h /server diff --git a/TAO/tests/Multiple_Inheritance/.gitignore b/TAO/tests/Multiple_Inheritance/.gitignore index 3d33a15f751..03d87e6cf1c 100644 --- a/TAO/tests/Multiple_Inheritance/.gitignore +++ b/TAO/tests/Multiple_Inheritance/.gitignore @@ -1,2 +1,7 @@ /client +/Multiple_InheritanceC.cpp +/Multiple_InheritanceC.h +/Multiple_InheritanceC.inl +/Multiple_InheritanceS.cpp +/Multiple_InheritanceS.h /server diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/.gitignore b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/.gitignore b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/.gitignore new file mode 100644 index 00000000000..38202305491 --- /dev/null +++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Muxed_GIOP_Versions/.gitignore b/TAO/tests/Muxed_GIOP_Versions/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/Muxed_GIOP_Versions/.gitignore +++ b/TAO/tests/Muxed_GIOP_Versions/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Muxing/.gitignore b/TAO/tests/Muxing/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Muxing/.gitignore +++ b/TAO/tests/Muxing/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Native_Exceptions/.gitignore b/TAO/tests/Native_Exceptions/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/Native_Exceptions/.gitignore +++ b/TAO/tests/Native_Exceptions/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/.gitignore b/TAO/tests/NestedUpcall/MT_Client_Test/.gitignore index 3d33a15f751..d87dd986e93 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/.gitignore +++ b/TAO/tests/NestedUpcall/MT_Client_Test/.gitignore @@ -1,2 +1,7 @@ /client +/MT_Client_TestC.cpp +/MT_Client_TestC.h +/MT_Client_TestC.inl +/MT_Client_TestS.cpp +/MT_Client_TestS.h /server diff --git a/TAO/tests/NestedUpcall/Simple/.gitignore b/TAO/tests/NestedUpcall/Simple/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/NestedUpcall/Simple/.gitignore +++ b/TAO/tests/NestedUpcall/Simple/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/NestedUpcall/Triangle_Test/.gitignore b/TAO/tests/NestedUpcall/Triangle_Test/.gitignore index 7d6113e78ec..f16c472e129 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/.gitignore +++ b/TAO/tests/NestedUpcall/Triangle_Test/.gitignore @@ -1,3 +1,8 @@ /initiator /server_A /server_B +/Triangle_TestC.cpp +/Triangle_TestC.h +/Triangle_TestC.inl +/Triangle_TestS.cpp +/Triangle_TestS.h diff --git a/TAO/tests/Nested_Event_Loop/.gitignore b/TAO/tests/Nested_Event_Loop/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/Nested_Event_Loop/.gitignore +++ b/TAO/tests/Nested_Event_Loop/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Nested_Upcall_Crash/.gitignore b/TAO/tests/Nested_Upcall_Crash/.gitignore index 8b8cd826826..ec120536941 100644 --- a/TAO/tests/Nested_Upcall_Crash/.gitignore +++ b/TAO/tests/Nested_Upcall_Crash/.gitignore @@ -1,3 +1,8 @@ /client /scavenger /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/No_Server_MT_Connect_Test/.gitignore b/TAO/tests/No_Server_MT_Connect_Test/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/No_Server_MT_Connect_Test/.gitignore +++ b/TAO/tests/No_Server_MT_Connect_Test/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/OBV/Any/.gitignore b/TAO/tests/OBV/Any/.gitignore index 3d33a15f751..29f97db33a6 100644 --- a/TAO/tests/OBV/Any/.gitignore +++ b/TAO/tests/OBV/Any/.gitignore @@ -1,2 +1,7 @@ +/AnyC.cpp +/AnyC.h +/AnyC.inl +/AnyS.cpp +/AnyS.h /client /server diff --git a/TAO/tests/OBV/Collocated/Forward/.gitignore b/TAO/tests/OBV/Collocated/Forward/.gitignore index 2815ad55986..726f484c7a2 100644 --- a/TAO/tests/OBV/Collocated/Forward/.gitignore +++ b/TAO/tests/OBV/Collocated/Forward/.gitignore @@ -1 +1,16 @@ /collocated +/TreeBaseC.cpp +/TreeBaseC.h +/TreeBaseC.inl +/TreeBaseS.cpp +/TreeBaseS.h +/TreeControllerC.cpp +/TreeControllerC.h +/TreeControllerC.inl +/TreeControllerS.cpp +/TreeControllerS.h +/TreeNodeC.cpp +/TreeNodeC.h +/TreeNodeC.inl +/TreeNodeS.cpp +/TreeNodeS.h diff --git a/TAO/tests/OBV/Factory/.gitignore b/TAO/tests/OBV/Factory/.gitignore index 3d33a15f751..0bdc3247e87 100644 --- a/TAO/tests/OBV/Factory/.gitignore +++ b/TAO/tests/OBV/Factory/.gitignore @@ -1,2 +1,7 @@ /client +/FactoryC.cpp +/FactoryC.h +/FactoryC.inl +/FactoryS.cpp +/FactoryS.h /server diff --git a/TAO/tests/OBV/Forward/.gitignore b/TAO/tests/OBV/Forward/.gitignore index 3d33a15f751..1c8689a10b8 100644 --- a/TAO/tests/OBV/Forward/.gitignore +++ b/TAO/tests/OBV/Forward/.gitignore @@ -1,2 +1,17 @@ /client /server +/TreeBaseC.cpp +/TreeBaseC.h +/TreeBaseC.inl +/TreeBaseS.cpp +/TreeBaseS.h +/TreeControllerC.cpp +/TreeControllerC.h +/TreeControllerC.inl +/TreeControllerS.cpp +/TreeControllerS.h +/TreeNodeC.cpp +/TreeNodeC.h +/TreeNodeC.inl +/TreeNodeS.cpp +/TreeNodeS.h diff --git a/TAO/tests/OBV/Indirection/.gitignore b/TAO/tests/OBV/Indirection/.gitignore new file mode 100644 index 00000000000..393865da7a5 --- /dev/null +++ b/TAO/tests/OBV/Indirection/.gitignore @@ -0,0 +1,7 @@ +/MessengerC.cpp +/MessengerC.h +/MessengerC.inl +/MessengerClient +/MessengerS.cpp +/MessengerS.h +/MessengerServer diff --git a/TAO/tests/OBV/Simple/.gitignore b/TAO/tests/OBV/Simple/.gitignore index 3d33a15f751..025ca0f4400 100644 --- a/TAO/tests/OBV/Simple/.gitignore +++ b/TAO/tests/OBV/Simple/.gitignore @@ -1,2 +1,7 @@ /client +/OBVC.cpp +/OBVC.h +/OBVC.inl +/OBVS.cpp +/OBVS.h /server diff --git a/TAO/tests/OBV/TC_Alignment/.gitignore b/TAO/tests/OBV/TC_Alignment/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/OBV/TC_Alignment/.gitignore +++ b/TAO/tests/OBV/TC_Alignment/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/OBV/Truncatable/.gitignore b/TAO/tests/OBV/Truncatable/.gitignore index 3d33a15f751..c70b6232f60 100644 --- a/TAO/tests/OBV/Truncatable/.gitignore +++ b/TAO/tests/OBV/Truncatable/.gitignore @@ -1,2 +1,12 @@ /client +/ExtraC.cpp +/ExtraC.h +/ExtraC.inl +/ExtraS.cpp +/ExtraS.h /server +/TruncatableC.cpp +/TruncatableC.h +/TruncatableC.inl +/TruncatableS.cpp +/TruncatableS.h diff --git a/TAO/tests/OBV/ValueBox/.gitignore b/TAO/tests/OBV/ValueBox/.gitignore index 3d33a15f751..f299fa17135 100644 --- a/TAO/tests/OBV/ValueBox/.gitignore +++ b/TAO/tests/OBV/ValueBox/.gitignore @@ -1,2 +1,22 @@ /client /server +/valueboxC.cpp +/valueboxC.h +/valueboxC.inl +/valueboxS.cpp +/valueboxS.h +/vb_basicC.cpp +/vb_basicC.h +/vb_basicC.inl +/vb_basicS.cpp +/vb_basicS.h +/vb_structC.cpp +/vb_structC.h +/vb_structC.inl +/vb_structS.cpp +/vb_structS.h +/vb_unionC.cpp +/vb_unionC.h +/vb_unionC.inl +/vb_unionS.cpp +/vb_unionS.h diff --git a/TAO/tests/ORB_Local_Config/Bug_3049/.gitignore b/TAO/tests/ORB_Local_Config/Bug_3049/.gitignore new file mode 100644 index 00000000000..a4cd5e8da7c --- /dev/null +++ b/TAO/tests/ORB_Local_Config/Bug_3049/.gitignore @@ -0,0 +1 @@ +/Test diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/.gitignore b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/.gitignore index a4cd5e8da7c..bbb6adff097 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/.gitignore +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/.gitignore @@ -1 +1,6 @@ /Test +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/ORB_init/Portspan/.gitignore b/TAO/tests/ORB_init/Portspan/.gitignore index 06845b19f52..2e326e8073b 100644 --- a/TAO/tests/ORB_init/Portspan/.gitignore +++ b/TAO/tests/ORB_init/Portspan/.gitignore @@ -1 +1,6 @@ /server +/simpleC.cpp +/simpleC.h +/simpleC.inl +/simpleS.cpp +/simpleS.h diff --git a/TAO/tests/ORB_shutdown/.gitignore b/TAO/tests/ORB_shutdown/.gitignore index 06845b19f52..41f66e96d8f 100644 --- a/TAO/tests/ORB_shutdown/.gitignore +++ b/TAO/tests/ORB_shutdown/.gitignore @@ -1 +1,6 @@ /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/ORT/.gitignore b/TAO/tests/ORT/.gitignore index 3d33a15f751..a378c635f13 100644 --- a/TAO/tests/ORT/.gitignore +++ b/TAO/tests/ORT/.gitignore @@ -1,2 +1,11 @@ /client +/ObjectReferenceFactoryC.cpp +/ObjectReferenceFactoryC.h +/ObjectReferenceFactoryC.inl +/ObjectReferenceFactoryS.h +/ORT_testC.cpp +/ORT_testC.h +/ORT_testC.inl +/ORT_testS.cpp +/ORT_testS.h /server diff --git a/TAO/tests/Object_Loader/.gitignore b/TAO/tests/Object_Loader/.gitignore index ad62966b56d..4b4674d9c37 100644 --- a/TAO/tests/Object_Loader/.gitignore +++ b/TAO/tests/Object_Loader/.gitignore @@ -1 +1,6 @@ /driver +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Objref_Sequence_Test/.gitignore b/TAO/tests/Objref_Sequence_Test/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Objref_Sequence_Test/.gitignore +++ b/TAO/tests/Objref_Sequence_Test/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/OctetSeq/.gitignore b/TAO/tests/OctetSeq/.gitignore index dd3aaeb0bc3..3ab7055522f 100644 --- a/TAO/tests/OctetSeq/.gitignore +++ b/TAO/tests/OctetSeq/.gitignore @@ -1,3 +1,8 @@ -/OctetSeq /client +/OctetSeq /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Ondemand_Write/.gitignore b/TAO/tests/Ondemand_Write/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Ondemand_Write/.gitignore +++ b/TAO/tests/Ondemand_Write/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Oneway_Buffering/.gitignore b/TAO/tests/Oneway_Buffering/.gitignore index 7448aa230b1..bbd643e7adf 100644 --- a/TAO/tests/Oneway_Buffering/.gitignore +++ b/TAO/tests/Oneway_Buffering/.gitignore @@ -1,3 +1,8 @@ /admin /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Oneway_Send_Timeouts/.gitignore b/TAO/tests/Oneway_Send_Timeouts/.gitignore new file mode 100644 index 00000000000..5da52f64e38 --- /dev/null +++ b/TAO/tests/Oneway_Send_Timeouts/.gitignore @@ -0,0 +1,6 @@ +/oneway_test +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Oneway_Timeouts/.gitignore b/TAO/tests/Oneway_Timeouts/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Oneway_Timeouts/.gitignore +++ b/TAO/tests/Oneway_Timeouts/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Oneways_Invoking_Twoways/.gitignore b/TAO/tests/Oneways_Invoking_Twoways/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/.gitignore +++ b/TAO/tests/Oneways_Invoking_Twoways/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Optimized_Connection/.gitignore b/TAO/tests/Optimized_Connection/.gitignore index 7149778f20e..2eef27fee30 100644 --- a/TAO/tests/Optimized_Connection/.gitignore +++ b/TAO/tests/Optimized_Connection/.gitignore @@ -1 +1,6 @@ /client +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/POA/Adapter_Activator/.gitignore b/TAO/tests/POA/Adapter_Activator/.gitignore new file mode 100644 index 00000000000..06845b19f52 --- /dev/null +++ b/TAO/tests/POA/Adapter_Activator/.gitignore @@ -0,0 +1 @@ +/server diff --git a/TAO/tests/POA/Bug_1592_Regression/.gitignore b/TAO/tests/POA/Bug_1592_Regression/.gitignore new file mode 100644 index 00000000000..38202305491 --- /dev/null +++ b/TAO/tests/POA/Bug_1592_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/POA/Bug_2511_Regression/.gitignore b/TAO/tests/POA/Bug_2511_Regression/.gitignore index 06845b19f52..d8866c41147 100644 --- a/TAO/tests/POA/Bug_2511_Regression/.gitignore +++ b/TAO/tests/POA/Bug_2511_Regression/.gitignore @@ -1 +1,6 @@ /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/POA/DSI/.gitignore b/TAO/tests/POA/DSI/.gitignore new file mode 100644 index 00000000000..48551ec44f9 --- /dev/null +++ b/TAO/tests/POA/DSI/.gitignore @@ -0,0 +1,7 @@ +/client +/DatabaseC.cpp +/DatabaseC.h +/DatabaseC.inl +/DatabaseS.cpp +/DatabaseS.h +/server diff --git a/TAO/tests/POA/Deactivate_Object/.gitignore b/TAO/tests/POA/Deactivate_Object/.gitignore index 06845b19f52..41f66e96d8f 100644 --- a/TAO/tests/POA/Deactivate_Object/.gitignore +++ b/TAO/tests/POA/Deactivate_Object/.gitignore @@ -1 +1,6 @@ /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/POA/Default_Servant/.gitignore b/TAO/tests/POA/Default_Servant/.gitignore index 3f09388ec7d..08b795142c3 100644 --- a/TAO/tests/POA/Default_Servant/.gitignore +++ b/TAO/tests/POA/Default_Servant/.gitignore @@ -1 +1,6 @@ /Default_Servant +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/POA/Default_Servant2/.gitignore b/TAO/tests/POA/Default_Servant2/.gitignore new file mode 100644 index 00000000000..86187fc48be --- /dev/null +++ b/TAO/tests/POA/Default_Servant2/.gitignore @@ -0,0 +1,7 @@ +/client +/FileC.cpp +/FileC.h +/FileC.inl +/FileS.cpp +/FileS.h +/server diff --git a/TAO/tests/POA/EndpointPolicy/.gitignore b/TAO/tests/POA/EndpointPolicy/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/POA/EndpointPolicy/.gitignore +++ b/TAO/tests/POA/EndpointPolicy/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/POA/Etherealization/.gitignore b/TAO/tests/POA/Etherealization/.gitignore index f46e267ee8c..6be81385137 100644 --- a/TAO/tests/POA/Etherealization/.gitignore +++ b/TAO/tests/POA/Etherealization/.gitignore @@ -1 +1,6 @@ /Etherealization +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/.gitignore b/TAO/tests/POA/Excessive_Object_Deactivations/.gitignore index 80e96aedf19..933e66c085b 100644 --- a/TAO/tests/POA/Excessive_Object_Deactivations/.gitignore +++ b/TAO/tests/POA/Excessive_Object_Deactivations/.gitignore @@ -1 +1,6 @@ /Excessive_Object_Deactivations +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/POA/Explicit_Activation/.gitignore b/TAO/tests/POA/Explicit_Activation/.gitignore new file mode 100644 index 00000000000..06845b19f52 --- /dev/null +++ b/TAO/tests/POA/Explicit_Activation/.gitignore @@ -0,0 +1 @@ +/server diff --git a/TAO/tests/POA/FindPOA/.gitignore b/TAO/tests/POA/FindPOA/.gitignore new file mode 100644 index 00000000000..8e2f1bae367 --- /dev/null +++ b/TAO/tests/POA/FindPOA/.gitignore @@ -0,0 +1 @@ +/FindPOA diff --git a/TAO/tests/POA/Forwarding/.gitignore b/TAO/tests/POA/Forwarding/.gitignore new file mode 100644 index 00000000000..38202305491 --- /dev/null +++ b/TAO/tests/POA/Forwarding/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/POA/Generic_Servant/.gitignore b/TAO/tests/POA/Generic_Servant/.gitignore new file mode 100644 index 00000000000..09b6defb2a9 --- /dev/null +++ b/TAO/tests/POA/Generic_Servant/.gitignore @@ -0,0 +1,6 @@ +/client +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/POA/Identity/.gitignore b/TAO/tests/POA/Identity/.gitignore index 519e6b37c55..01f3b6b2271 100644 --- a/TAO/tests/POA/Identity/.gitignore +++ b/TAO/tests/POA/Identity/.gitignore @@ -1 +1,6 @@ /Identity +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/POA/Loader/.gitignore b/TAO/tests/POA/Loader/.gitignore new file mode 100644 index 00000000000..06845b19f52 --- /dev/null +++ b/TAO/tests/POA/Loader/.gitignore @@ -0,0 +1 @@ +/server diff --git a/TAO/tests/POA/MT_Servant_Locator/.gitignore b/TAO/tests/POA/MT_Servant_Locator/.gitignore index bf26cab0dae..6f6f2d09d24 100644 --- a/TAO/tests/POA/MT_Servant_Locator/.gitignore +++ b/TAO/tests/POA/MT_Servant_Locator/.gitignore @@ -1 +1,6 @@ /MT_Servant_Locator +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/.gitignore b/TAO/tests/POA/Nested_Non_Servant_Upcalls/.gitignore index 09e8b87f9fe..b98f5d07b4a 100644 --- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/.gitignore +++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/.gitignore @@ -1 +1,6 @@ /Nested_Non_Servant_Upcalls +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/POA/NewPOA/.gitignore b/TAO/tests/POA/NewPOA/.gitignore new file mode 100644 index 00000000000..07c73553a43 --- /dev/null +++ b/TAO/tests/POA/NewPOA/.gitignore @@ -0,0 +1 @@ +/NewPOA diff --git a/TAO/tests/POA/Non_Retain_System_Id/.gitignore b/TAO/tests/POA/Non_Retain_System_Id/.gitignore new file mode 100644 index 00000000000..319aaae0698 --- /dev/null +++ b/TAO/tests/POA/Non_Retain_System_Id/.gitignore @@ -0,0 +1,6 @@ +/test +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/POA/Non_Servant_Upcalls/.gitignore b/TAO/tests/POA/Non_Servant_Upcalls/.gitignore index 7aed9387eb6..da99c3d739f 100644 --- a/TAO/tests/POA/Non_Servant_Upcalls/.gitignore +++ b/TAO/tests/POA/Non_Servant_Upcalls/.gitignore @@ -1 +1,6 @@ /Non_Servant_Upcalls +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/POA/Object_Reactivation/.gitignore b/TAO/tests/POA/Object_Reactivation/.gitignore index 7a015fedaf2..fad6e8cca1d 100644 --- a/TAO/tests/POA/Object_Reactivation/.gitignore +++ b/TAO/tests/POA/Object_Reactivation/.gitignore @@ -1 +1,6 @@ /Object_Reactivation +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/.gitignore b/TAO/tests/POA/On_Demand_Act_Direct_Coll/.gitignore new file mode 100644 index 00000000000..e60bcbb2b81 --- /dev/null +++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/.gitignore @@ -0,0 +1,6 @@ +/On_Demand_Act_D_Coll +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/POA/On_Demand_Activation/.gitignore b/TAO/tests/POA/On_Demand_Activation/.gitignore new file mode 100644 index 00000000000..06845b19f52 --- /dev/null +++ b/TAO/tests/POA/On_Demand_Activation/.gitignore @@ -0,0 +1 @@ +/server diff --git a/TAO/tests/POA/On_Demand_Loading/.gitignore b/TAO/tests/POA/On_Demand_Loading/.gitignore new file mode 100644 index 00000000000..06845b19f52 --- /dev/null +++ b/TAO/tests/POA/On_Demand_Loading/.gitignore @@ -0,0 +1 @@ +/server diff --git a/TAO/tests/POA/POA_BiDir/.gitignore b/TAO/tests/POA/POA_BiDir/.gitignore new file mode 100644 index 00000000000..2ec2478f5f4 --- /dev/null +++ b/TAO/tests/POA/POA_BiDir/.gitignore @@ -0,0 +1 @@ +/POA_BiDir diff --git a/TAO/tests/POA/POA_Destruction/.gitignore b/TAO/tests/POA/POA_Destruction/.gitignore index 2b97eafc011..25b0709aef6 100644 --- a/TAO/tests/POA/POA_Destruction/.gitignore +++ b/TAO/tests/POA/POA_Destruction/.gitignore @@ -1 +1,6 @@ /POA_Destruction +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/POA/Persistent_ID/.gitignore b/TAO/tests/POA/Persistent_ID/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/POA/Persistent_ID/.gitignore +++ b/TAO/tests/POA/Persistent_ID/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/POA/Reference_Counted_Servant/.gitignore b/TAO/tests/POA/Reference_Counted_Servant/.gitignore new file mode 100644 index 00000000000..06845b19f52 --- /dev/null +++ b/TAO/tests/POA/Reference_Counted_Servant/.gitignore @@ -0,0 +1 @@ +/server diff --git a/TAO/tests/POA/Reference_Counting/.gitignore b/TAO/tests/POA/Reference_Counting/.gitignore index 06845b19f52..a16aa5082a3 100644 --- a/TAO/tests/POA/Reference_Counting/.gitignore +++ b/TAO/tests/POA/Reference_Counting/.gitignore @@ -1 +1,6 @@ +/HelloC.cpp +/HelloC.h +/HelloC.inl +/HelloS.cpp +/HelloS.h /server diff --git a/TAO/tests/POA/RootPOA/.gitignore b/TAO/tests/POA/RootPOA/.gitignore new file mode 100644 index 00000000000..9237bae3165 --- /dev/null +++ b/TAO/tests/POA/RootPOA/.gitignore @@ -0,0 +1 @@ +/RootPOA diff --git a/TAO/tests/POA/Single_Threaded_POA/.gitignore b/TAO/tests/POA/Single_Threaded_POA/.gitignore index a62908a9a64..ae996edc0fb 100644 --- a/TAO/tests/POA/Single_Threaded_POA/.gitignore +++ b/TAO/tests/POA/Single_Threaded_POA/.gitignore @@ -1 +1,6 @@ /Single_Threaded_POA +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/POA/TIE/.gitignore b/TAO/tests/POA/TIE/.gitignore new file mode 100644 index 00000000000..38202305491 --- /dev/null +++ b/TAO/tests/POA/TIE/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/POA/wait_for_completion/.gitignore b/TAO/tests/POA/wait_for_completion/.gitignore index 21ab1c84abe..75b5ac3589b 100644 --- a/TAO/tests/POA/wait_for_completion/.gitignore +++ b/TAO/tests/POA/wait_for_completion/.gitignore @@ -1 +1,6 @@ +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h /wait_for_completion diff --git a/TAO/tests/Parallel_Connect_Strategy/.gitignore b/TAO/tests/Parallel_Connect_Strategy/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Parallel_Connect_Strategy/.gitignore +++ b/TAO/tests/Parallel_Connect_Strategy/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Param_Test/.gitignore b/TAO/tests/Param_Test/.gitignore index 2b06ae2ef93..d97c002c081 100644 --- a/TAO/tests/Param_Test/.gitignore +++ b/TAO/tests/Param_Test/.gitignore @@ -1,4 +1,9 @@ /anyop /client /param_testA.cpp +/param_testC.cpp +/param_testC.h +/param_testC.inl +/param_testS.cpp +/param_testS.h /server diff --git a/TAO/tests/Policies/.gitignore b/TAO/tests/Policies/.gitignore index 5a81466a9e4..03a87184981 100644 --- a/TAO/tests/Policies/.gitignore +++ b/TAO/tests/Policies/.gitignore @@ -1 +1,6 @@ /Manipulation +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Portable_Interceptors/AMI/.gitignore b/TAO/tests/Portable_Interceptors/AMI/.gitignore index 5da19e0ff12..31223a0b420 100644 --- a/TAO/tests/Portable_Interceptors/AMI/.gitignore +++ b/TAO/tests/Portable_Interceptors/AMI/.gitignore @@ -1,12 +1,13 @@ +/client +/server +/test.ior /TestC.cpp /TestC.h /TestC.i +/TestC.inl /TestS.cpp /TestS.h /TestS.i /TestS_T.cpp /TestS_T.h /TestS_T.i -/client -/server -/test.ior diff --git a/TAO/tests/Portable_Interceptors/AdvSlot/.gitignore b/TAO/tests/Portable_Interceptors/AdvSlot/.gitignore index 3d33a15f751..b23032ebbc8 100644 --- a/TAO/tests/Portable_Interceptors/AdvSlot/.gitignore +++ b/TAO/tests/Portable_Interceptors/AdvSlot/.gitignore @@ -1,2 +1,7 @@ /client /server +/StateTransferC.cpp +/StateTransferC.h +/StateTransferC.inl +/StateTransferS.cpp +/StateTransferS.h diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/.gitignore b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/.gitignore index 3d33a15f751..8a50bfae60b 100644 --- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/.gitignore +++ b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/.gitignore @@ -1,2 +1,7 @@ /client +/InvokeMeC.cpp +/InvokeMeC.h +/InvokeMeC.inl +/InvokeMeS.cpp +/InvokeMeS.h /server diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/.gitignore b/TAO/tests/Portable_Interceptors/AdvSlotExt/.gitignore index 3d33a15f751..b23032ebbc8 100644 --- a/TAO/tests/Portable_Interceptors/AdvSlotExt/.gitignore +++ b/TAO/tests/Portable_Interceptors/AdvSlotExt/.gitignore @@ -1,2 +1,7 @@ /client /server +/StateTransferC.cpp +/StateTransferC.h +/StateTransferC.inl +/StateTransferS.cpp +/StateTransferS.h diff --git a/TAO/tests/Portable_Interceptors/Benchmark/.gitignore b/TAO/tests/Portable_Interceptors/Benchmark/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/.gitignore +++ b/TAO/tests/Portable_Interceptors/Benchmark/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp index a6259649f88..f61f73018a9 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp @@ -8,15 +8,15 @@ void get_interceptor_type (int argc, ACE_TCHAR *argv[], interceptor_type = IT_NONE; for (int i = 1; i < argc - 1; ++i) { - if (ACE_OS_String::strcmp (argv[i], ACE_TEXT ("-r")) == 0) + if (ACE_OS::strcmp (argv[i], ACE_TEXT ("-r")) == 0) { - if (ACE_OS_String::strcmp (argv[i+1], ACE_TEXT ("none")) == 0) + if (ACE_OS::strcmp (argv[i+1], ACE_TEXT ("none")) == 0) interceptor_type = IT_NONE; - if (ACE_OS_String::strcmp (argv[i+1], ACE_TEXT ("noop")) == 0) + if (ACE_OS::strcmp (argv[i+1], ACE_TEXT ("noop")) == 0) interceptor_type = IT_NOOP; - if (ACE_OS_String::strcmp (argv[i+1], ACE_TEXT ("context")) == 0) + if (ACE_OS::strcmp (argv[i+1], ACE_TEXT ("context")) == 0) interceptor_type = IT_CONTEXT; - if (ACE_OS_String::strcmp (argv[i+1], ACE_TEXT ("dynamic")) == 0) + if (ACE_OS::strcmp (argv[i+1], ACE_TEXT ("dynamic")) == 0) interceptor_type = IT_DYNAMIC; } } diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/.gitignore b/TAO/tests/Portable_Interceptors/Bug_1559/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/.gitignore +++ b/TAO/tests/Portable_Interceptors/Bug_1559/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp index 51fdc7cb5ef..044a8d74dac 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp @@ -66,7 +66,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( // locally on the server side as a side effect of another call, // meaning that the client hasn't added the service context yet. // Same goes for the shutdown call - if (ACE_OS_String::strcmp ("shutdown", operation.in ()) == 0) + if (ACE_OS::strcmp ("shutdown", operation.in ()) == 0) return; IOP::ServiceId id = ::service_id; diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/.gitignore b/TAO/tests/Portable_Interceptors/Bug_2133/.gitignore new file mode 100644 index 00000000000..3a36990f005 --- /dev/null +++ b/TAO/tests/Portable_Interceptors/Bug_2133/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/.gitignore b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/.gitignore +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp index f364a40b997..b3ba85faa40 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp @@ -42,7 +42,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( operation.in ())); // Ignore the shutdown operation. - if (ACE_OS_String::strcmp ("shutdown", operation.in ()) == 0) + if (ACE_OS::strcmp ("shutdown", operation.in ()) == 0) return; // retrieve the context diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/.gitignore b/TAO/tests/Portable_Interceptors/Bug_3079/.gitignore new file mode 100644 index 00000000000..38202305491 --- /dev/null +++ b/TAO/tests/Portable_Interceptors/Bug_3079/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp index b2b5e218e97..3847c69378d 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp @@ -89,8 +89,7 @@ Client_Request_Interceptor::receive_exception ( tc = ex->type (); id = tc->id (); - if (ACE_OS_String::strcmp (id, - "IDL:omg.org/CORBA/TRANSIENT:1.0") == 0) + if (ACE_OS::strcmp (id, "IDL:omg.org/CORBA/TRANSIENT:1.0") == 0) throw ::CORBA::TRANSIENT (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO); } } diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/.gitignore b/TAO/tests/Portable_Interceptors/Bug_3080/.gitignore new file mode 100644 index 00000000000..38202305491 --- /dev/null +++ b/TAO/tests/Portable_Interceptors/Bug_3080/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/.gitignore b/TAO/tests/Portable_Interceptors/Bug_3582/.gitignore new file mode 100644 index 00000000000..38202305491 --- /dev/null +++ b/TAO/tests/Portable_Interceptors/Bug_3582/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/.gitignore b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/.gitignore index 5c2c1ae9f35..264b662b99a 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/.gitignore +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/.gitignore @@ -1 +1,6 @@ /Collocated_Test +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/.gitignore b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/.gitignore index 2815ad55986..2c48362ada4 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/.gitignore +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/.gitignore @@ -1 +1,6 @@ /collocated +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Portable_Interceptors/Dynamic/.gitignore b/TAO/tests/Portable_Interceptors/Dynamic/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/.gitignore +++ b/TAO/tests/Portable_Interceptors/Dynamic/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/.gitignore b/TAO/tests/Portable_Interceptors/ForwardRequest/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/.gitignore +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/.gitignore b/TAO/tests/Portable_Interceptors/IORInterceptor/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/.gitignore +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/.gitignore b/TAO/tests/Portable_Interceptors/ORB_Shutdown/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/.gitignore +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Portable_Interceptors/PICurrent/.gitignore b/TAO/tests/Portable_Interceptors/PICurrent/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/.gitignore +++ b/TAO/tests/Portable_Interceptors/PICurrent/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/.gitignore b/TAO/tests/Portable_Interceptors/PolicyFactory/.gitignore index 06845b19f52..d8866c41147 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/.gitignore +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/.gitignore @@ -1 +1,6 @@ /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/.gitignore b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/.gitignore index 76b92d309b8..5c5ce0752e5 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/.gitignore +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/.gitignore @@ -1 +1,6 @@ /PI_ProcMode_Collocated_Test +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/.gitignore b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/.gitignore index 9330b986e85..6ec0973e7aa 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/.gitignore +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/.gitignore @@ -1,2 +1,7 @@ /PI_ProcMode_Remote_TestClient /PI_ProcMode_Remote_TestServer +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Portable_Interceptors/Redirection/.gitignore b/TAO/tests/Portable_Interceptors/Redirection/.gitignore new file mode 100644 index 00000000000..38202305491 --- /dev/null +++ b/TAO/tests/Portable_Interceptors/Redirection/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/.gitignore b/TAO/tests/Portable_Interceptors/Register_Initial_References/.gitignore index 06845b19f52..d8866c41147 100644 --- a/TAO/tests/Portable_Interceptors/Register_Initial_References/.gitignore +++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/.gitignore @@ -1 +1,6 @@ /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/.gitignore b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/.gitignore +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/.gitignore b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/.gitignore +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/.gitignore b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/.gitignore index ee4c9268234..b261b295cb7 100644 --- a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/.gitignore +++ b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/.gitignore @@ -1 +1,7 @@ +/server /test +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/RTCORBA/Banded_Connections/.gitignore b/TAO/tests/RTCORBA/Banded_Connections/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/RTCORBA/Banded_Connections/.gitignore +++ b/TAO/tests/RTCORBA/Banded_Connections/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/.gitignore b/TAO/tests/RTCORBA/Bug_3382_Regression/.gitignore new file mode 100644 index 00000000000..e814ca61cfc --- /dev/null +++ b/TAO/tests/RTCORBA/Bug_3382_Regression/.gitignore @@ -0,0 +1,8 @@ +/client +/server +/simple_client +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/RTCORBA/Bug_3643_Regression/.gitignore b/TAO/tests/RTCORBA/Bug_3643_Regression/.gitignore new file mode 100644 index 00000000000..38202305491 --- /dev/null +++ b/TAO/tests/RTCORBA/Bug_3643_Regression/.gitignore @@ -0,0 +1,7 @@ +/client +/server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/RTCORBA/Client_Propagated/.gitignore b/TAO/tests/RTCORBA/Client_Propagated/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/.gitignore +++ b/TAO/tests/RTCORBA/Client_Propagated/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/RTCORBA/Client_Protocol/.gitignore b/TAO/tests/RTCORBA/Client_Protocol/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/RTCORBA/Client_Protocol/.gitignore +++ b/TAO/tests/RTCORBA/Client_Protocol/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/RTCORBA/Collocation/.gitignore b/TAO/tests/RTCORBA/Collocation/.gitignore index d66b2a12584..abe5cfe842c 100644 --- a/TAO/tests/RTCORBA/Collocation/.gitignore +++ b/TAO/tests/RTCORBA/Collocation/.gitignore @@ -1 +1,6 @@ /Collocation +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/RTCORBA/Diffserv/.gitignore b/TAO/tests/RTCORBA/Diffserv/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/RTCORBA/Diffserv/.gitignore +++ b/TAO/tests/RTCORBA/Diffserv/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/.gitignore b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/.gitignore +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/RTCORBA/Explicit_Binding/.gitignore b/TAO/tests/RTCORBA/Explicit_Binding/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/RTCORBA/Explicit_Binding/.gitignore +++ b/TAO/tests/RTCORBA/Explicit_Binding/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/RTCORBA/Linear_Priority/.gitignore b/TAO/tests/RTCORBA/Linear_Priority/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/.gitignore +++ b/TAO/tests/RTCORBA/Linear_Priority/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/.gitignore b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/.gitignore index e8f72f67029..3c346adea93 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/.gitignore +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/.gitignore @@ -1,3 +1,8 @@ /client /server /test_run.data +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/RTCORBA/Persistent_IOR/.gitignore b/TAO/tests/RTCORBA/Persistent_IOR/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/.gitignore +++ b/TAO/tests/RTCORBA/Persistent_IOR/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/RTCORBA/Policy_Combinations/.gitignore b/TAO/tests/RTCORBA/Policy_Combinations/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/.gitignore +++ b/TAO/tests/RTCORBA/Policy_Combinations/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/.gitignore b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/.gitignore +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/RTCORBA/Private_Connection/.gitignore b/TAO/tests/RTCORBA/Private_Connection/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/RTCORBA/Private_Connection/.gitignore +++ b/TAO/tests/RTCORBA/Private_Connection/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/.gitignore b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/.gitignore +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/RTCORBA/Server_Declared/.gitignore b/TAO/tests/RTCORBA/Server_Declared/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/RTCORBA/Server_Declared/.gitignore +++ b/TAO/tests/RTCORBA/Server_Declared/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/RTCORBA/Server_Protocol/.gitignore b/TAO/tests/RTCORBA/Server_Protocol/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/.gitignore +++ b/TAO/tests/RTCORBA/Server_Protocol/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/RTCORBA/Thread_Pool/.gitignore b/TAO/tests/RTCORBA/Thread_Pool/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/.gitignore +++ b/TAO/tests/RTCORBA/Thread_Pool/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/.gitignore b/TAO/tests/RTScheduling/Scheduling_Interceptor/.gitignore index 8d084db7ad4..3f166bdb782 100644 --- a/TAO/tests/RTScheduling/Scheduling_Interceptor/.gitignore +++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/.gitignore @@ -1,2 +1,7 @@ /Scheduler_Interceptor_Client /Scheduler_Interceptor_Server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/RTScheduling/VoidData/.gitignore b/TAO/tests/RTScheduling/VoidData/.gitignore index 9c5a45c41d9..06ef2bb2df4 100644 --- a/TAO/tests/RTScheduling/VoidData/.gitignore +++ b/TAO/tests/RTScheduling/VoidData/.gitignore @@ -1 +1,6 @@ +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h /VoidData diff --git a/TAO/tests/Reliable_Oneways/.gitignore b/TAO/tests/Reliable_Oneways/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Reliable_Oneways/.gitignore +++ b/TAO/tests/Reliable_Oneways/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/SHMIOP/.gitignore b/TAO/tests/SHMIOP/.gitignore new file mode 100644 index 00000000000..6ddbe14cb7b --- /dev/null +++ b/TAO/tests/SHMIOP/.gitignore @@ -0,0 +1,6 @@ +/shmiop_test +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Sequence_Iterators/.gitignore b/TAO/tests/Sequence_Iterators/.gitignore new file mode 100644 index 00000000000..c24a6328561 --- /dev/null +++ b/TAO/tests/Sequence_Iterators/.gitignore @@ -0,0 +1,4 @@ +/Bounded_String +/StringSeq +/Unbounded_Objectref +/Unbounded_Value diff --git a/TAO/tests/Sequence_Unit_Tests/.gitignore b/TAO/tests/Sequence_Unit_Tests/.gitignore index 8cd30e3f028..03f81154c30 100644 --- a/TAO/tests/Sequence_Unit_Tests/.gitignore +++ b/TAO/tests/Sequence_Unit_Tests/.gitignore @@ -1,5 +1,19 @@ +/bounded_object_reference_sequence_ut +/bounded_sequence_cdr_ut /Bounded_Simple_Types /Bounded_String +/bounded_string_sequence_ut +/bounded_value_sequence_ut +/object_reference_sequence_element_ut +/string_sequence_element_ut +/testing_allocation_traits_ut +/unbounded_fwd_object_reference_sequence_ut +/unbounded_object_reference_sequence_ut /Unbounded_Octet +/unbounded_octet_sequence_nocopy_ut +/unbounded_octet_sequence_ut +/unbounded_sequence_cdr_ut /Unbounded_Simple_Types /Unbounded_String +/unbounded_string_sequence_ut +/unbounded_value_sequence_ut diff --git a/TAO/tests/Servant_To_Reference_Test/.gitignore b/TAO/tests/Servant_To_Reference_Test/.gitignore index 06845b19f52..41f66e96d8f 100644 --- a/TAO/tests/Servant_To_Reference_Test/.gitignore +++ b/TAO/tests/Servant_To_Reference_Test/.gitignore @@ -1 +1,6 @@ /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Server_Connection_Purging/.gitignore b/TAO/tests/Server_Connection_Purging/.gitignore index 3d33a15f751..47e6fb14a68 100644 --- a/TAO/tests/Server_Connection_Purging/.gitignore +++ b/TAO/tests/Server_Connection_Purging/.gitignore @@ -1,2 +1,8 @@ /client /server +/shutdown_client +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Server_Leaks/.gitignore b/TAO/tests/Server_Leaks/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Server_Leaks/.gitignore +++ b/TAO/tests/Server_Leaks/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Server_Port_Zero/.gitignore b/TAO/tests/Server_Port_Zero/.gitignore index 06845b19f52..41f66e96d8f 100644 --- a/TAO/tests/Server_Port_Zero/.gitignore +++ b/TAO/tests/Server_Port_Zero/.gitignore @@ -1 +1,6 @@ /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Single_Read/.gitignore b/TAO/tests/Single_Read/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/Single_Read/.gitignore +++ b/TAO/tests/Single_Read/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Skeleton_Inheritance/.gitignore b/TAO/tests/Skeleton_Inheritance/.gitignore new file mode 100644 index 00000000000..7c000604630 --- /dev/null +++ b/TAO/tests/Skeleton_Inheritance/.gitignore @@ -0,0 +1,23 @@ +/client +/idl_1C.cpp +/idl_1C.h +/idl_1C.inl +/idl_1S.cpp +/idl_1S.h +/idl_2C.cpp +/idl_2C.h +/idl_2C.inl +/idl_2S.cpp +/idl_2S.h +/idl_3C.cpp +/idl_3C.h +/idl_3C.inl +/idl_3S.cpp +/idl_3S.h +/server +/skeleton_inheritance_skel_1_export.h +/skeleton_inheritance_skel_2_export.h +/skeleton_inheritance_skel_3_export.h +/skeleton_inheritance_stub_1_export.h +/skeleton_inheritance_stub_2_export.h +/skeleton_inheritance_stub_3_export.h diff --git a/TAO/tests/Smart_Proxies/.gitignore b/TAO/tests/Smart_Proxies/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/Smart_Proxies/.gitignore +++ b/TAO/tests/Smart_Proxies/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Smart_Proxies/Benchmark/.gitignore b/TAO/tests/Smart_Proxies/Benchmark/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/.gitignore +++ b/TAO/tests/Smart_Proxies/Benchmark/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Smart_Proxies/Collocation/.gitignore b/TAO/tests/Smart_Proxies/Collocation/.gitignore index 95811e0016a..579ec4e42bc 100644 --- a/TAO/tests/Smart_Proxies/Collocation/.gitignore +++ b/TAO/tests/Smart_Proxies/Collocation/.gitignore @@ -1 +1,6 @@ +/DiamondC.cpp +/DiamondC.h +/DiamondC.inl +/DiamondS.cpp +/DiamondS.h /main diff --git a/TAO/tests/Smart_Proxies/On_Demand/.gitignore b/TAO/tests/Smart_Proxies/On_Demand/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/.gitignore +++ b/TAO/tests/Smart_Proxies/On_Demand/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Smart_Proxies/Policy/.gitignore b/TAO/tests/Smart_Proxies/Policy/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/Smart_Proxies/Policy/.gitignore +++ b/TAO/tests/Smart_Proxies/Policy/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Smart_Proxies/dtor/.gitignore b/TAO/tests/Smart_Proxies/dtor/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/Smart_Proxies/dtor/.gitignore +++ b/TAO/tests/Smart_Proxies/dtor/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Stack_Recursion/.gitignore b/TAO/tests/Stack_Recursion/.gitignore index 3d33a15f751..3a36990f005 100644 --- a/TAO/tests/Stack_Recursion/.gitignore +++ b/TAO/tests/Stack_Recursion/.gitignore @@ -1,2 +1,7 @@ /client /server +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/Strategies/.gitignore b/TAO/tests/Strategies/.gitignore index 3d33a15f751..5c31f5cc378 100644 --- a/TAO/tests/Strategies/.gitignore +++ b/TAO/tests/Strategies/.gitignore @@ -1,2 +1,7 @@ /client /server +/simple_testC.cpp +/simple_testC.h +/simple_testC.inl +/simple_testS.cpp +/simple_testS.h diff --git a/TAO/tests/Time_Policy/.gitignore b/TAO/tests/Time_Policy/.gitignore new file mode 100644 index 00000000000..ee4c9268234 --- /dev/null +++ b/TAO/tests/Time_Policy/.gitignore @@ -0,0 +1 @@ +/test diff --git a/TAO/tests/Time_Policy_Custom/.gitignore b/TAO/tests/Time_Policy_Custom/.gitignore new file mode 100644 index 00000000000..ee4c9268234 --- /dev/null +++ b/TAO/tests/Time_Policy_Custom/.gitignore @@ -0,0 +1 @@ +/test diff --git a/TAO/tests/Timed_Buffered_Oneways/.gitignore b/TAO/tests/Timed_Buffered_Oneways/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/Timed_Buffered_Oneways/.gitignore +++ b/TAO/tests/Timed_Buffered_Oneways/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/Timeout/.gitignore b/TAO/tests/Timeout/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/Timeout/.gitignore +++ b/TAO/tests/Timeout/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/TransportCurrent/lib/.gitignore b/TAO/tests/TransportCurrent/lib/.gitignore new file mode 100644 index 00000000000..0f652d72fb8 --- /dev/null +++ b/TAO/tests/TransportCurrent/lib/.gitignore @@ -0,0 +1,5 @@ +/Current_TestC.cpp +/Current_TestC.h +/Current_TestC.inl +/Current_TestS.cpp +/Current_TestS.h diff --git a/TAO/tests/Transport_Cache_Manager/.gitignore b/TAO/tests/Transport_Cache_Manager/.gitignore new file mode 100644 index 00000000000..7dcadc44c5c --- /dev/null +++ b/TAO/tests/Transport_Cache_Manager/.gitignore @@ -0,0 +1,2 @@ +/Bug_3549_Regression +/Bug_3558_Regression diff --git a/TAO/tests/Two_Objects/.gitignore b/TAO/tests/Two_Objects/.gitignore index 3d33a15f751..c7dbf7c7789 100644 --- a/TAO/tests/Two_Objects/.gitignore +++ b/TAO/tests/Two_Objects/.gitignore @@ -1,2 +1,7 @@ /client /server +/Two_ObjectsC.cpp +/Two_ObjectsC.h +/Two_ObjectsC.inl +/Two_ObjectsS.cpp +/Two_ObjectsS.h diff --git a/TAO/tests/Typedef_String_Array/.gitignore b/TAO/tests/Typedef_String_Array/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/Typedef_String_Array/.gitignore +++ b/TAO/tests/Typedef_String_Array/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/UNKNOWN_Exception/.gitignore b/TAO/tests/UNKNOWN_Exception/.gitignore index 3d33a15f751..38202305491 100644 --- a/TAO/tests/UNKNOWN_Exception/.gitignore +++ b/TAO/tests/UNKNOWN_Exception/.gitignore @@ -1,2 +1,7 @@ /client /server +/testC.cpp +/testC.h +/testC.inl +/testS.cpp +/testS.h diff --git a/TAO/tests/ZIOP/.gitignore b/TAO/tests/ZIOP/.gitignore new file mode 100644 index 00000000000..aa3ded776ec --- /dev/null +++ b/TAO/tests/ZIOP/.gitignore @@ -0,0 +1,5 @@ +/TestC.cpp +/TestC.h +/TestC.inl +/TestS.cpp +/TestS.h diff --git a/TAO/tests/objref_comparison_test/.gitignore b/TAO/tests/objref_comparison_test/.gitignore new file mode 100644 index 00000000000..2f442b46281 --- /dev/null +++ b/TAO/tests/objref_comparison_test/.gitignore @@ -0,0 +1,6 @@ +/fooC.cpp +/fooC.h +/fooC.inl +/fooS.cpp +/fooS.h +/server diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 80ad6101d6d..ddb7e953ffa 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -145,6 +145,7 @@ jobs: echo "ssl=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features echo "openssl11=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features echo "versioned_namespace=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features + echo "ipv6=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features displayName: Create default.features file - powershell: | echo $(OptionalFeatures) | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features @@ -170,175 +171,3 @@ jobs: platform: $(BuildPlatform) configuration: $(BuildConfiguration) maximumCpuCount: true - -- job: VisualStudio2015 - timeoutInMinutes: 90 - pool: - vmImage: vs2015-win2012r2 - strategy: - matrix: - Debug64: - BuildPlatform: x64 - BuildConfiguration: Debug - vcpkgarch: x64-windows - vcpkglibdir: debug\lib - Release64: - BuildPlatform: x64 - BuildConfiguration: Release - vcpkgarch: x64-windows - vcpkglibdir: lib - variables: - XERCESCROOT: $(Build.SourcesDirectory)\vcpkg\packages\xerces-c_$(vcpkgarch) - SSL_ROOT: $(Build.SourcesDirectory)\vcpkg\packages\openssl-windows_$(vcpkgarch) - SSL_LIBDIR: $(SSL_ROOT)\$(vcpkglibdir) - XERCESC_LIBDIR: $(XERCESCROOT)\$(vcpkglibdir) - VCPKG_ROOT: $(Build.SourcesDirectory)\vcpkg - steps: - - powershell: | - git clone --depth 1 git://github.com/Microsoft/vcpkg.git $(VCPKG_ROOT) - $(VCPKG_ROOT)\bootstrap-vcpkg.bat - $(VCPKG_ROOT)\vcpkg.exe install --recurse --triplet $(vcpkgarch) openssl xerces-c - displayName: vcpkg - - powershell: | - '#include "ace/config-win32.h"' > $(ACE_ROOT)/ace/config.h - displayName: Create config.h file - - powershell: | - echo "xerces3=1" | out-file -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features - echo "ssl=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features - echo "openssl11=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features - echo "versioned_namespace=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features - displayName: Create default.features file - - powershell: git clone --depth 1 git://github.com/DOCGroup/MPC.git $(MPC_ROOT) - displayName: git clone MPC - - powershell: perl $(ACE_ROOT)/bin/mwc.pl -type vc14 $(TAO_ROOT)/TAO_ACE.mwc -workers 4 - displayName: Run script mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc - - powershell: perl $(ACE_ROOT)/bin/mwc.pl -type vc14 $(ACE_ROOT)/tests/tests.mwc -workers 4 - displayName: Run script mwc.pl on $(ACE_ROOT)/tests/tests.mwc - - task: VSBuild@1 - displayName: Build solution TAO\TAO_ACE.sln - inputs: - solution: TAO\TAO_ACE.sln - platform: $(BuildPlatform) - configuration: $(BuildConfiguration) - maximumCpuCount: true - - task: VSBuild@1 - displayName: Build solution ACE\tests\tests.sln - inputs: - solution: ACE\tests\tests.sln - platform: $(BuildPlatform) - configuration: $(BuildConfiguration) - maximumCpuCount: true - -- job: Linux - timeoutInMinutes: 90 - pool: - vmImage: ubuntu-18.04 - strategy: - matrix: - GCC48: - CC: gcc-4.8 - CXX: g++-4.8 - PackageDeps: g++-4.8 - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - GCC6: - CC: gcc-6 - CXX: g++-6 - PackageDeps: g++-6 - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - GCC7: - CC: gcc-7 - CXX: g++-7 - PackageDeps: g++-7 - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - GCC8: - CC: gcc-8 - CXX: g++-8 - PackageDeps: g++-8 - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - GCC9: - CC: gcc-9 - CXX: g++-9 - PackageDeps: g++-9 - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - CLANG5: - CC: clang-5.0 - CXX: clang++-5.0 - PackageDeps: clang-5.0 - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU - CLANG6: - CC: clang-6.0 - CXX: clang++-6.0 - PackageDeps: clang-6.0 - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU - CLANG7: - CC: clang-7 - CXX: clang++-7 - PackageDeps: clang-7 - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU - CLANG8: - CC: clang-8 - CXX: clang++-8 - PackageDeps: clang-8 - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU - CLANG9: - CC: clang-9 - CXX: clang++-9 - PackageDeps: clang-9 - Repo: llvm-toolchain-$(lsb_release -cs)-9 - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU - steps: - - script: | - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - - sudo apt-add-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ $(Repo) main" - displayName: Add repository ($(Repo)) - condition: and(succeeded(), ne(variables['Repo'], '')) - - script: | - sudo apt-get --yes update - sudo apt-get --yes install libxerces-c-dev libssl-dev $(PackageDeps) - displayName: install system package dependencies - - powershell: | - '#include "ace/config-linux.h"' > $(ACE_ROOT)/ace/config.h - displayName: Create config.h file - - powershell: | - 'xerces3=1' > $(ACE_ROOT)/bin/MakeProjectCreator/config/default.features - 'ssl=1' >> $(ACE_ROOT)/bin/MakeProjectCreator/config/default.features - 'versioned_namespace=1' >> $(ACE_ROOT)/bin/MakeProjectCreator/config/default.features - displayName: Create default.features file - - powershell: | - 'c++11=1' > $(ACE_ROOT)/include/makeinclude/platform_macros.GNU - 'xerces3=1' >> $(ACE_ROOT)/include/makeinclude/platform_macros.GNU - 'ssl=1' >> $(ACE_ROOT)/include/makeinclude/platform_macros.GNU - "$(platform_file)" >> $(ACE_ROOT)/include/makeinclude/platform_macros.GNU - displayName: Create platform_macros file - - powershell: git clone --depth 1 git://github.com/DOCGroup/MPC.git $(MPC_ROOT) - displayName: git clone MPC - - powershell: perl $(ACE_ROOT)/bin/mwc.pl -type gnuace $(TAO_ROOT)/TAO_ACE.mwc -workers 4 - displayName: Run mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc - - powershell: perl $(ACE_ROOT)/bin/mwc.pl -type gnuace $(ACE_ROOT)/tests/tests.mwc -workers 4 - displayName: Run mwc.pl on $(ACE_ROOT)/tests/tests.mwc - - bash: make -j 6 -C TAO - displayName: Build TAO project - - bash: make -j 6 -C ACE/tests - displayName: Build tests project - -- job: MacOSX - timeoutInMinutes: 90 - pool: - vmImage: macOS-latest - steps: - - powershell: | - '#include "ace/config-macosx.h"' > $(ACE_ROOT)/ace/config.h - displayName: Create config.h file - - powershell: | - 'include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU' > $(ACE_ROOT)/include/makeinclude/platform_macros.GNU; - displayName: Create platform_macros file - - powershell: git clone --depth 1 git://github.com/DOCGroup/MPC.git $(MPC_ROOT) - displayName: git clone MPC - - powershell: perl $(ACE_ROOT)/bin/mwc.pl -type gnuace $(TAO_ROOT)/TAO_ACE.mwc -workers 4 - displayName: Run mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc - - powershell: perl $(ACE_ROOT)/bin/mwc.pl -type gnuace $(ACE_ROOT)/tests/tests.mwc -workers 4 - displayName: Run mwc.pl on $(ACE_ROOT)/tests/tests.mwc - - bash: make -j 6 -C TAO - displayName: Build TAO project - - bash: make -j 6 -C ACE/tests - displayName: Build tests project |