[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-445-g1d78e1a966
Kitware Robot
kwrobot at kitware.com
Fri Nov 15 09:26:08 EST 2019
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 1d78e1a966912d35e1dea0e986bc0b977141e880 (commit)
via c1ae0532f3a1d6d2c7b6e8f370be2a6dca89bf93 (commit)
via aba3048055be13b168b08537d877bbfaab28c978 (commit)
via 8dd284bf196de65caec90eff8723b59559434149 (commit)
via 154b8d1a279e42183a876bdd816c347ae9fe3829 (commit)
via 34b7dbbfc37180989b57a0fb25ca4e0010cf992b (commit)
via 28994115e83b568ccba546db26a55381cbad244d (commit)
via 42d5d8f425e655a07d3dcb0802d90cb5c167b164 (commit)
via ed65b3e984ccce9b915a5a71e5a8d13b892b63d8 (commit)
from b55f605e70f3186e6611f4f84dc246d39453af03 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1d78e1a966912d35e1dea0e986bc0b977141e880
commit 1d78e1a966912d35e1dea0e986bc0b977141e880
Merge: c1ae0532f3 8dd284bf19
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 15 14:17:50 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Nov 15 09:18:23 2019 -0500
Merge topic 'cmFileLockPool-remove-dynamic-memory-usage'
8dd284bf19 cmFileLockPool: enhance items management
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !4041
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c1ae0532f3a1d6d2c7b6e8f370be2a6dca89bf93
commit c1ae0532f3a1d6d2c7b6e8f370be2a6dca89bf93
Merge: aba3048055 28994115e8
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 15 14:16:50 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Nov 15 09:17:26 2019 -0500
Merge topic 'ctest_test-repeat'
28994115e8 ctest_test: Add option to REPEAT tests
42d5d8f425 cmCTestMultiProcessHandler: Hold repeat mode as a member
ed65b3e984 CTest: Rename internal APIs for --repeat options
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !4011
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aba3048055be13b168b08537d877bbfaab28c978
commit aba3048055be13b168b08537d877bbfaab28c978
Merge: b55f605e70 154b8d1a27
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 15 14:15:49 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Nov 15 09:16:29 2019 -0500
Merge topic 'Fortran-line-continued-use'
154b8d1a27 Fortran: ignore CPP line directives in line-continued USE stmts
34b7dbbfc3 LexerParser: Regenerate parsers with bison 3.4.2
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !4048
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8dd284bf196de65caec90eff8723b59559434149
commit 8dd284bf196de65caec90eff8723b59559434149
Author: Marc Chevrier <marc.chevrier at gmail.com>
AuthorDate: Tue Nov 12 17:17:27 2019 +0100
Commit: Marc Chevrier <marc.chevrier at gmail.com>
CommitDate: Thu Nov 14 14:21:30 2019 +0100
cmFileLockPool: enhance items management
diff --git a/Source/cmFileLock.cxx b/Source/cmFileLock.cxx
index e90f57140e..6010233cad 100644
--- a/Source/cmFileLock.cxx
+++ b/Source/cmFileLock.cxx
@@ -3,11 +3,23 @@
#include "cmFileLock.h"
#include <cassert>
+#include <utility>
#include "cmFileLockResult.h"
// Common implementation
+cmFileLock::cmFileLock(cmFileLock&& other) noexcept
+{
+ this->File = other.File;
+#if defined(_WIN32)
+ other.File = INVALID_HANDLE_VALUE;
+#else
+ other.File = -1;
+#endif
+ this->Filename = std::move(other.Filename);
+}
+
cmFileLock::~cmFileLock()
{
if (!this->Filename.empty()) {
@@ -17,6 +29,19 @@ cmFileLock::~cmFileLock()
}
}
+cmFileLock& cmFileLock::operator=(cmFileLock&& other) noexcept
+{
+ this->File = other.File;
+#if defined(_WIN32)
+ other.File = INVALID_HANDLE_VALUE;
+#else
+ other.File = -1;
+#endif
+ this->Filename = std::move(other.Filename);
+
+ return *this;
+}
+
cmFileLockResult cmFileLock::Lock(const std::string& filename,
unsigned long timeout)
{
diff --git a/Source/cmFileLock.h b/Source/cmFileLock.h
index 2130d65dbe..5fe068e8f1 100644
--- a/Source/cmFileLock.h
+++ b/Source/cmFileLock.h
@@ -26,7 +26,9 @@ public:
~cmFileLock();
cmFileLock(cmFileLock const&) = delete;
+ cmFileLock(cmFileLock&&) noexcept;
cmFileLock& operator=(cmFileLock const&) = delete;
+ cmFileLock& operator=(cmFileLock&&) noexcept;
/**
* @brief Lock the file.
diff --git a/Source/cmFileLockPool.cxx b/Source/cmFileLockPool.cxx
index 8db2db2103..e1f6e948a9 100644
--- a/Source/cmFileLockPool.cxx
+++ b/Source/cmFileLockPool.cxx
@@ -3,40 +3,34 @@
#include "cmFileLockPool.h"
#include <cassert>
+#include <utility>
-#include "cmAlgorithms.h"
#include "cmFileLock.h"
#include "cmFileLockResult.h"
cmFileLockPool::cmFileLockPool() = default;
-cmFileLockPool::~cmFileLockPool()
-{
- cmDeleteAll(this->FunctionScopes);
- cmDeleteAll(this->FileScopes);
-}
+cmFileLockPool::~cmFileLockPool() = default;
void cmFileLockPool::PushFunctionScope()
{
- this->FunctionScopes.push_back(new ScopePool());
+ this->FunctionScopes.push_back(ScopePool());
}
void cmFileLockPool::PopFunctionScope()
{
assert(!this->FunctionScopes.empty());
- delete this->FunctionScopes.back();
this->FunctionScopes.pop_back();
}
void cmFileLockPool::PushFileScope()
{
- this->FileScopes.push_back(new ScopePool());
+ this->FileScopes.push_back(ScopePool());
}
void cmFileLockPool::PopFileScope()
{
assert(!this->FileScopes.empty());
- delete this->FileScopes.back();
this->FileScopes.pop_back();
}
@@ -49,7 +43,7 @@ cmFileLockResult cmFileLockPool::LockFunctionScope(const std::string& filename,
if (this->FunctionScopes.empty()) {
return cmFileLockResult::MakeNoFunction();
}
- return this->FunctionScopes.back()->Lock(filename, timeoutSec);
+ return this->FunctionScopes.back().Lock(filename, timeoutSec);
}
cmFileLockResult cmFileLockPool::LockFileScope(const std::string& filename,
@@ -59,7 +53,7 @@ cmFileLockResult cmFileLockPool::LockFileScope(const std::string& filename,
return cmFileLockResult::MakeAlreadyLocked();
}
assert(!this->FileScopes.empty());
- return this->FileScopes.back()->Lock(filename, timeoutSec);
+ return this->FileScopes.back().Lock(filename, timeoutSec);
}
cmFileLockResult cmFileLockPool::LockProcessScope(const std::string& filename,
@@ -74,14 +68,14 @@ cmFileLockResult cmFileLockPool::LockProcessScope(const std::string& filename,
cmFileLockResult cmFileLockPool::Release(const std::string& filename)
{
for (auto& funcScope : this->FunctionScopes) {
- const cmFileLockResult result = funcScope->Release(filename);
+ const cmFileLockResult result = funcScope.Release(filename);
if (!result.IsOk()) {
return result;
}
}
for (auto& fileScope : this->FileScopes) {
- const cmFileLockResult result = fileScope->Release(filename);
+ const cmFileLockResult result = fileScope.Release(filename);
if (!result.IsOk()) {
return result;
}
@@ -93,14 +87,14 @@ cmFileLockResult cmFileLockPool::Release(const std::string& filename)
bool cmFileLockPool::IsAlreadyLocked(const std::string& filename) const
{
for (auto const& funcScope : this->FunctionScopes) {
- const bool result = funcScope->IsAlreadyLocked(filename);
+ const bool result = funcScope.IsAlreadyLocked(filename);
if (result) {
return true;
}
}
for (auto const& fileScope : this->FileScopes) {
- const bool result = fileScope->IsAlreadyLocked(filename);
+ const bool result = fileScope.IsAlreadyLocked(filename);
if (result) {
return true;
}
@@ -111,21 +105,29 @@ bool cmFileLockPool::IsAlreadyLocked(const std::string& filename) const
cmFileLockPool::ScopePool::ScopePool() = default;
-cmFileLockPool::ScopePool::~ScopePool()
+cmFileLockPool::ScopePool::~ScopePool() = default;
+
+cmFileLockPool::ScopePool::ScopePool(ScopePool&&) noexcept = default;
+
+cmFileLockPool::ScopePool& cmFileLockPool::ScopePool::operator=(
+ ScopePool&& other) noexcept
{
- cmDeleteAll(this->Locks);
+ if (this != &other) {
+ this->Locks = std::move(other.Locks);
+ }
+
+ return *this;
}
cmFileLockResult cmFileLockPool::ScopePool::Lock(const std::string& filename,
unsigned long timeoutSec)
{
- cmFileLock* lock = new cmFileLock();
- const cmFileLockResult result = lock->Lock(filename, timeoutSec);
+ cmFileLock lock;
+ const cmFileLockResult result = lock.Lock(filename, timeoutSec);
if (result.IsOk()) {
- this->Locks.push_back(lock);
+ this->Locks.push_back(std::move(lock));
return cmFileLockResult::MakeOk();
}
- delete lock;
return result;
}
@@ -133,8 +135,8 @@ cmFileLockResult cmFileLockPool::ScopePool::Release(
const std::string& filename)
{
for (auto& lock : this->Locks) {
- if (lock->IsLocked(filename)) {
- return lock->Release();
+ if (lock.IsLocked(filename)) {
+ return lock.Release();
}
}
return cmFileLockResult::MakeOk();
@@ -144,7 +146,7 @@ bool cmFileLockPool::ScopePool::IsAlreadyLocked(
const std::string& filename) const
{
for (auto const& lock : this->Locks) {
- if (lock->IsLocked(filename)) {
+ if (lock.IsLocked(filename)) {
return true;
}
}
diff --git a/Source/cmFileLockPool.h b/Source/cmFileLockPool.h
index dae68dd011..d45c82cc41 100644
--- a/Source/cmFileLockPool.h
+++ b/Source/cmFileLockPool.h
@@ -8,7 +8,8 @@
#include <string>
#include <vector>
-class cmFileLock;
+#include "cmFileLock.h"
+
class cmFileLockResult;
class cmFileLockPool
@@ -64,7 +65,9 @@ private:
~ScopePool();
ScopePool(ScopePool const&) = delete;
+ ScopePool(ScopePool&&) noexcept;
ScopePool& operator=(ScopePool const&) = delete;
+ ScopePool& operator=(ScopePool&&) noexcept;
cmFileLockResult Lock(const std::string& filename,
unsigned long timeoutSec);
@@ -72,17 +75,12 @@ private:
bool IsAlreadyLocked(const std::string& filename) const;
private:
- using List = std::vector<cmFileLock*>;
- using It = List::iterator;
- using CIt = List::const_iterator;
+ using List = std::vector<cmFileLock>;
List Locks;
};
- using List = std::vector<ScopePool*>;
-
- using It = List::iterator;
- using CIt = List::const_iterator;
+ using List = std::vector<ScopePool>;
List FunctionScopes;
List FileScopes;
diff --git a/Utilities/IWYU/mapping.imp b/Utilities/IWYU/mapping.imp
index 5e4c7ba586..3497b532ca 100644
--- a/Utilities/IWYU/mapping.imp
+++ b/Utilities/IWYU/mapping.imp
@@ -47,6 +47,8 @@
# HACK: iwyu suggests <ext/alloc_traits.h> and <memory> each time vector[] is used.
# https://github.com/include-what-you-use/include-what-you-use/issues/166
{ include: [ "<ext/alloc_traits.h>", private, "<vector>", public ] },
+ { symbol: [ "std::allocator_traits<std::allocator<cmFileLock> >::value_type", private, "<vector>", public ] },
+ { symbol: [ "std::allocator_traits<std::allocator<cmFileLockPool::ScopePool> >::value_type", private, "<vector>", public ] },
{ symbol: [ "std::allocator_traits<std::allocator<cmComputeComponentGraph::TarjanEntry> >::value_type", private, "<vector>", public ] },
{ symbol: [ "std::allocator_traits<std::allocator<cmFortranFile> >::value_type", private, "<vector>", public ] },
{ symbol: [ "std::allocator_traits<std::allocator<cmGraphEdgeList> >::value_type", private, "<vector>", public ] },
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=154b8d1a279e42183a876bdd816c347ae9fe3829
commit 154b8d1a279e42183a876bdd816c347ae9fe3829
Author: Tiziano Müller <tiziano.mueller at chem.uzh.ch>
AuthorDate: Wed Nov 13 16:01:06 2019 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 13 11:30:19 2019 -0500
Fortran: ignore CPP line directives in line-continued USE stmts
Issue: #18188
diff --git a/Source/LexerParser/cmFortranParser.cxx b/Source/LexerParser/cmFortranParser.cxx
index f016fd8b6f..2494aadcc7 100644
--- a/Source/LexerParser/cmFortranParser.cxx
+++ b/Source/LexerParser/cmFortranParser.cxx
@@ -511,16 +511,16 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 2
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 593
+#define YYLAST 594
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 41
/* YYNNTS -- Number of nonterminals. */
#define YYNNTS 14
/* YYNRULES -- Number of rules. */
-#define YYNRULES 63
+#define YYNRULES 64
/* YYNSTATES -- Number of states. */
-#define YYNSTATES 126
+#define YYNSTATES 127
#define YYUNDEFTOK 2
#define YYMAXUTOK 295
@@ -576,7 +576,7 @@ static const yytype_uint8 yyrline[] =
220, 220, 221, 221, 222, 222, 223, 223, 224, 224,
225, 225, 226, 226, 227, 227, 228, 228, 231, 232,
233, 234, 235, 236, 237, 238, 239, 240, 241, 242,
- 243, 244, 245, 246
+ 243, 244, 245, 246, 247
};
#endif
@@ -628,16 +628,16 @@ static const yytype_int16 yypact[] =
-39, 21, -39, 1, -39, -20, -39, -39, -39, -39,
-39, -39, -39, -39, -39, -39, -39, -39, -39, -39,
-39, -39, -39, -39, -39, -39, -24, -18, 20, -8,
- -3, 39, -39, 15, 16, 18, 19, 33, -39, -39,
+ -3, 40, -39, 15, 16, 17, 19, 34, -39, -39,
-39, -39, -39, -39, 59, -39, -39, -39, -39, -39,
- 35, 36, 37, -39, -39, -39, -39, -39, -39, 76,
- 114, 129, 167, 182, -39, -39, -39, -39, -39, -39,
+ 36, 37, 38, -39, -39, -39, -39, -39, -39, 77,
+ 115, 130, 168, 183, -39, -39, -39, -39, -39, -39,
-39, -39, -39, -39, -39, -39, -39, -39, -39, -39,
- -39, -39, 220, 235, 273, 288, -21, 26, -39, 326,
- 341, 379, 394, 432, 447, -39, -39, -39, -39, -39,
- -39, -39, -39, -39, 38, 40, 41, 485, -39, -39,
- -39, -39, -39, -39, 45, -39, -39, -39, 43, 500,
- 538, -39, -39, -39, 553, -39
+ -39, -39, -39, 221, 236, 274, 289, -21, 26, -39,
+ 327, 342, 380, 395, 433, 448, -39, -39, -39, -39,
+ -39, -39, -39, -39, -39, 39, 41, 42, 486, -39,
+ -39, -39, -39, -39, -39, 18, -39, -39, -39, 43,
+ 501, 539, -39, -39, -39, 554, -39
};
/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -651,13 +651,13 @@ static const yytype_uint8 yydefact[] =
0, 0, 3, 0, 0, 0, 0, 0, 46, 46,
46, 46, 26, 46, 0, 46, 46, 4, 46, 46,
0, 0, 0, 46, 46, 46, 46, 46, 46, 0,
- 0, 0, 0, 0, 15, 57, 56, 62, 58, 59,
- 60, 61, 63, 55, 48, 49, 50, 51, 52, 53,
- 54, 47, 0, 0, 0, 0, 0, 0, 46, 0,
- 0, 0, 0, 0, 0, 21, 22, 23, 24, 14,
- 10, 13, 9, 6, 0, 0, 0, 0, 5, 16,
- 17, 18, 19, 20, 0, 46, 46, 11, 0, 0,
- 0, 46, 7, 12, 0, 8
+ 0, 0, 0, 0, 15, 57, 56, 64, 62, 58,
+ 59, 60, 61, 63, 55, 48, 49, 50, 51, 52,
+ 53, 54, 47, 0, 0, 0, 0, 0, 0, 46,
+ 0, 0, 0, 0, 0, 0, 21, 22, 23, 24,
+ 14, 10, 13, 9, 6, 0, 0, 0, 0, 5,
+ 16, 17, 18, 19, 20, 0, 46, 46, 11, 0,
+ 0, 0, 46, 7, 12, 0, 8
};
/* YYPGOTO[NTERM-NUM]. */
@@ -671,7 +671,7 @@ static const yytype_int8 yypgoto[] =
static const yytype_int8 yydefgoto[] =
{
-1, 1, 32, 33, 34, 35, 36, 37, 38, 39,
- 40, 41, 44, 81
+ 40, 41, 44, 82
};
/* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If
@@ -679,66 +679,66 @@ static const yytype_int8 yydefgoto[] =
number is the opposite. If YYTABLE_NINF, syntax error. */
static const yytype_uint8 yytable[] =
{
- 59, 60, 61, 62, 42, 63, 104, 82, 83, 105,
- 84, 85, 43, 45, 46, 89, 90, 91, 92, 93,
- 94, 2, 3, 47, 4, 49, 50, 5, 6, 7,
+ 59, 60, 61, 62, 42, 63, 105, 83, 84, 106,
+ 85, 86, 43, 45, 46, 90, 91, 92, 93, 94,
+ 95, 2, 3, 47, 4, 49, 50, 5, 6, 7,
8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
- 18, 19, 20, 21, 22, 23, 24, 54, 0, 55,
- 107, 56, 57, 48, 106, 25, 26, 27, 28, 29,
- 30, 31, 64, 65, 66, 51, 58, 52, 86, 87,
- 88, 114, 53, 115, 116, 118, 121, 119, 120, 95,
- 65, 66, 0, 124, 0, 67, 68, 69, 70, 71,
- 72, 73, 74, 0, 75, 76, 77, 78, 79, 80,
- 0, 0, 67, 68, 69, 70, 71, 72, 73, 74,
- 0, 75, 76, 77, 78, 79, 80, 96, 65, 66,
+ 18, 19, 20, 21, 22, 23, 24, 54, 119, 55,
+ 56, 108, 57, 48, 107, 25, 26, 27, 28, 29,
+ 30, 31, 64, 65, 66, 67, 51, 58, 52, 87,
+ 88, 89, 115, 53, 116, 117, 122, 0, 120, 121,
+ 96, 65, 66, 67, 125, 68, 69, 70, 71, 72,
+ 73, 74, 75, 0, 76, 77, 78, 79, 80, 81,
+ 0, 0, 0, 68, 69, 70, 71, 72, 73, 74,
+ 75, 0, 76, 77, 78, 79, 80, 81, 97, 65,
+ 66, 67, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 98, 65, 66, 67, 0, 0, 0,
+ 0, 68, 69, 70, 71, 72, 73, 74, 75, 0,
+ 76, 77, 78, 79, 80, 81, 68, 69, 70, 71,
+ 72, 73, 74, 75, 0, 76, 77, 78, 79, 80,
+ 81, 99, 65, 66, 67, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 100, 65, 66, 67,
+ 0, 0, 0, 0, 68, 69, 70, 71, 72, 73,
+ 74, 75, 0, 76, 77, 78, 79, 80, 81, 68,
+ 69, 70, 71, 72, 73, 74, 75, 0, 76, 77,
+ 78, 79, 80, 81, 101, 65, 66, 67, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 102,
+ 65, 66, 67, 0, 0, 0, 0, 68, 69, 70,
+ 71, 72, 73, 74, 75, 0, 76, 77, 78, 79,
+ 80, 81, 68, 69, 70, 71, 72, 73, 74, 75,
+ 0, 76, 77, 78, 79, 80, 81, 103, 65, 66,
+ 67, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 104, 65, 66, 67, 0, 0, 0, 0,
+ 68, 69, 70, 71, 72, 73, 74, 75, 0, 76,
+ 77, 78, 79, 80, 81, 68, 69, 70, 71, 72,
+ 73, 74, 75, 0, 76, 77, 78, 79, 80, 81,
+ 109, 65, 66, 67, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 110, 65, 66, 67, 0,
+ 0, 0, 0, 68, 69, 70, 71, 72, 73, 74,
+ 75, 0, 76, 77, 78, 79, 80, 81, 68, 69,
+ 70, 71, 72, 73, 74, 75, 0, 76, 77, 78,
+ 79, 80, 81, 111, 65, 66, 67, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 112, 65,
+ 66, 67, 0, 0, 0, 0, 68, 69, 70, 71,
+ 72, 73, 74, 75, 0, 76, 77, 78, 79, 80,
+ 81, 68, 69, 70, 71, 72, 73, 74, 75, 0,
+ 76, 77, 78, 79, 80, 81, 113, 65, 66, 67,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 97, 65, 66, 0, 0, 0, 0, 0,
- 67, 68, 69, 70, 71, 72, 73, 74, 0, 75,
- 76, 77, 78, 79, 80, 67, 68, 69, 70, 71,
- 72, 73, 74, 0, 75, 76, 77, 78, 79, 80,
- 98, 65, 66, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 99, 65, 66, 0, 0,
- 0, 0, 0, 67, 68, 69, 70, 71, 72, 73,
- 74, 0, 75, 76, 77, 78, 79, 80, 67, 68,
- 69, 70, 71, 72, 73, 74, 0, 75, 76, 77,
- 78, 79, 80, 100, 65, 66, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 101, 65,
- 66, 0, 0, 0, 0, 0, 67, 68, 69, 70,
- 71, 72, 73, 74, 0, 75, 76, 77, 78, 79,
- 80, 67, 68, 69, 70, 71, 72, 73, 74, 0,
- 75, 76, 77, 78, 79, 80, 102, 65, 66, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 103, 65, 66, 0, 0, 0, 0, 0, 67,
- 68, 69, 70, 71, 72, 73, 74, 0, 75, 76,
- 77, 78, 79, 80, 67, 68, 69, 70, 71, 72,
- 73, 74, 0, 75, 76, 77, 78, 79, 80, 108,
- 65, 66, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 109, 65, 66, 0, 0, 0,
- 0, 0, 67, 68, 69, 70, 71, 72, 73, 74,
- 0, 75, 76, 77, 78, 79, 80, 67, 68, 69,
- 70, 71, 72, 73, 74, 0, 75, 76, 77, 78,
- 79, 80, 110, 65, 66, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 111, 65, 66,
- 0, 0, 0, 0, 0, 67, 68, 69, 70, 71,
- 72, 73, 74, 0, 75, 76, 77, 78, 79, 80,
- 67, 68, 69, 70, 71, 72, 73, 74, 0, 75,
- 76, 77, 78, 79, 80, 112, 65, 66, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 113, 65, 66, 0, 0, 0, 0, 0, 67, 68,
- 69, 70, 71, 72, 73, 74, 0, 75, 76, 77,
- 78, 79, 80, 67, 68, 69, 70, 71, 72, 73,
- 74, 0, 75, 76, 77, 78, 79, 80, 117, 65,
- 66, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 122, 65, 66, 0, 0, 0, 0,
- 0, 67, 68, 69, 70, 71, 72, 73, 74, 0,
- 75, 76, 77, 78, 79, 80, 67, 68, 69, 70,
- 71, 72, 73, 74, 0, 75, 76, 77, 78, 79,
- 80, 123, 65, 66, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 125, 65, 66, 0,
- 0, 0, 0, 0, 67, 68, 69, 70, 71, 72,
- 73, 74, 0, 75, 76, 77, 78, 79, 80, 67,
- 68, 69, 70, 71, 72, 73, 74, 0, 75, 76,
- 77, 78, 79, 80
+ 0, 114, 65, 66, 67, 0, 0, 0, 0, 68,
+ 69, 70, 71, 72, 73, 74, 75, 0, 76, 77,
+ 78, 79, 80, 81, 68, 69, 70, 71, 72, 73,
+ 74, 75, 0, 76, 77, 78, 79, 80, 81, 118,
+ 65, 66, 67, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 123, 65, 66, 67, 0, 0,
+ 0, 0, 68, 69, 70, 71, 72, 73, 74, 75,
+ 0, 76, 77, 78, 79, 80, 81, 68, 69, 70,
+ 71, 72, 73, 74, 75, 0, 76, 77, 78, 79,
+ 80, 81, 124, 65, 66, 67, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 126, 65, 66,
+ 67, 0, 0, 0, 0, 68, 69, 70, 71, 72,
+ 73, 74, 75, 0, 76, 77, 78, 79, 80, 81,
+ 68, 69, 70, 71, 72, 73, 74, 75, 0, 76,
+ 77, 78, 79, 80, 81
};
static const yytype_int8 yycheck[] =
@@ -747,62 +747,62 @@ static const yytype_int8 yycheck[] =
48, 49, 32, 37, 32, 53, 54, 55, 56, 57,
58, 0, 1, 3, 3, 33, 29, 6, 7, 8,
9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
- 19, 20, 21, 22, 23, 24, 25, 32, -1, 33,
- 88, 33, 33, 33, 28, 34, 35, 36, 37, 38,
- 39, 40, 3, 4, 5, 26, 33, 28, 33, 33,
- 33, 33, 33, 33, 33, 30, 33, 115, 116, 3,
- 4, 5, -1, 121, -1, 26, 27, 28, 29, 30,
+ 19, 20, 21, 22, 23, 24, 25, 32, 30, 33,
+ 33, 89, 33, 33, 28, 34, 35, 36, 37, 38,
+ 39, 40, 3, 4, 5, 6, 26, 33, 28, 33,
+ 33, 33, 33, 33, 33, 33, 33, -1, 116, 117,
+ 3, 4, 5, 6, 122, 26, 27, 28, 29, 30,
31, 32, 33, -1, 35, 36, 37, 38, 39, 40,
- -1, -1, 26, 27, 28, 29, 30, 31, 32, 33,
+ -1, -1, -1, 26, 27, 28, 29, 30, 31, 32,
+ 33, -1, 35, 36, 37, 38, 39, 40, 3, 4,
+ 5, 6, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 3, 4, 5, 6, -1, -1, -1,
+ -1, 26, 27, 28, 29, 30, 31, 32, 33, -1,
+ 35, 36, 37, 38, 39, 40, 26, 27, 28, 29,
+ 30, 31, 32, 33, -1, 35, 36, 37, 38, 39,
+ 40, 3, 4, 5, 6, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 3, 4, 5, 6,
+ -1, -1, -1, -1, 26, 27, 28, 29, 30, 31,
+ 32, 33, -1, 35, 36, 37, 38, 39, 40, 26,
+ 27, 28, 29, 30, 31, 32, 33, -1, 35, 36,
+ 37, 38, 39, 40, 3, 4, 5, 6, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 3,
+ 4, 5, 6, -1, -1, -1, -1, 26, 27, 28,
+ 29, 30, 31, 32, 33, -1, 35, 36, 37, 38,
+ 39, 40, 26, 27, 28, 29, 30, 31, 32, 33,
-1, 35, 36, 37, 38, 39, 40, 3, 4, 5,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 3, 4, 5, -1, -1, -1, -1, -1,
+ 6, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 3, 4, 5, 6, -1, -1, -1, -1,
26, 27, 28, 29, 30, 31, 32, 33, -1, 35,
36, 37, 38, 39, 40, 26, 27, 28, 29, 30,
31, 32, 33, -1, 35, 36, 37, 38, 39, 40,
- 3, 4, 5, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 3, 4, 5, -1, -1,
+ 3, 4, 5, 6, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 3, 4, 5, 6, -1,
-1, -1, -1, 26, 27, 28, 29, 30, 31, 32,
33, -1, 35, 36, 37, 38, 39, 40, 26, 27,
28, 29, 30, 31, 32, 33, -1, 35, 36, 37,
- 38, 39, 40, 3, 4, 5, -1, -1, -1, -1,
+ 38, 39, 40, 3, 4, 5, 6, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, 3, 4,
- 5, -1, -1, -1, -1, -1, 26, 27, 28, 29,
+ 5, 6, -1, -1, -1, -1, 26, 27, 28, 29,
30, 31, 32, 33, -1, 35, 36, 37, 38, 39,
40, 26, 27, 28, 29, 30, 31, 32, 33, -1,
- 35, 36, 37, 38, 39, 40, 3, 4, 5, -1,
+ 35, 36, 37, 38, 39, 40, 3, 4, 5, 6,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 3, 4, 5, -1, -1, -1, -1, -1, 26,
+ -1, 3, 4, 5, 6, -1, -1, -1, -1, 26,
27, 28, 29, 30, 31, 32, 33, -1, 35, 36,
37, 38, 39, 40, 26, 27, 28, 29, 30, 31,
32, 33, -1, 35, 36, 37, 38, 39, 40, 3,
- 4, 5, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 3, 4, 5, -1, -1, -1,
+ 4, 5, 6, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 3, 4, 5, 6, -1, -1,
-1, -1, 26, 27, 28, 29, 30, 31, 32, 33,
-1, 35, 36, 37, 38, 39, 40, 26, 27, 28,
29, 30, 31, 32, 33, -1, 35, 36, 37, 38,
- 39, 40, 3, 4, 5, -1, -1, -1, -1, -1,
+ 39, 40, 3, 4, 5, 6, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, 3, 4, 5,
- -1, -1, -1, -1, -1, 26, 27, 28, 29, 30,
+ 6, -1, -1, -1, -1, 26, 27, 28, 29, 30,
31, 32, 33, -1, 35, 36, 37, 38, 39, 40,
26, 27, 28, 29, 30, 31, 32, 33, -1, 35,
- 36, 37, 38, 39, 40, 3, 4, 5, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 3, 4, 5, -1, -1, -1, -1, -1, 26, 27,
- 28, 29, 30, 31, 32, 33, -1, 35, 36, 37,
- 38, 39, 40, 26, 27, 28, 29, 30, 31, 32,
- 33, -1, 35, 36, 37, 38, 39, 40, 3, 4,
- 5, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 3, 4, 5, -1, -1, -1, -1,
- -1, 26, 27, 28, 29, 30, 31, 32, 33, -1,
- 35, 36, 37, 38, 39, 40, 26, 27, 28, 29,
- 30, 31, 32, 33, -1, 35, 36, 37, 38, 39,
- 40, 3, 4, 5, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 3, 4, 5, -1,
- -1, -1, -1, -1, 26, 27, 28, 29, 30, 31,
- 32, 33, -1, 35, 36, 37, 38, 39, 40, 26,
- 27, 28, 29, 30, 31, 32, 33, -1, 35, 36,
- 37, 38, 39, 40
+ 36, 37, 38, 39, 40
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -815,13 +815,13 @@ static const yytype_uint8 yystos[] =
39, 40, 43, 44, 45, 46, 47, 48, 49, 50,
51, 52, 3, 32, 53, 37, 32, 3, 33, 33,
29, 26, 28, 33, 32, 33, 33, 33, 33, 53,
- 53, 53, 53, 53, 3, 4, 5, 26, 27, 28,
- 29, 30, 31, 32, 33, 35, 36, 37, 38, 39,
- 40, 54, 53, 53, 53, 53, 33, 33, 33, 53,
- 53, 53, 53, 53, 53, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 27, 30, 28, 53, 3, 3,
- 3, 3, 3, 3, 33, 33, 33, 3, 30, 53,
- 53, 33, 3, 3, 53, 3
+ 53, 53, 53, 53, 3, 4, 5, 6, 26, 27,
+ 28, 29, 30, 31, 32, 33, 35, 36, 37, 38,
+ 39, 40, 54, 53, 53, 53, 53, 33, 33, 33,
+ 53, 53, 53, 53, 53, 53, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 27, 30, 28, 53, 3,
+ 3, 3, 3, 3, 3, 33, 33, 33, 3, 30,
+ 53, 53, 33, 3, 3, 53, 3
};
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
@@ -833,7 +833,7 @@ static const yytype_uint8 yyr1[] =
45, 45, 46, 46, 47, 47, 48, 48, 49, 49,
50, 50, 51, 51, 52, 52, 53, 53, 54, 54,
54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
- 54, 54, 54, 54
+ 54, 54, 54, 54, 54
};
/* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */
@@ -845,7 +845,7 @@ static const yytype_uint8 yyr2[] =
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 0, 2, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1
+ 1, 1, 1, 1, 1
};
@@ -1998,6 +1998,6 @@ yyreturn:
#endif
return yyresult;
}
-#line 249 "cmFortranParser.y"
+#line 250 "cmFortranParser.y"
/* End of grammar */
diff --git a/Source/LexerParser/cmFortranParser.y b/Source/LexerParser/cmFortranParser.y
index 87f3e0a16e..1b54dd9f7d 100644
--- a/Source/LexerParser/cmFortranParser.y
+++ b/Source/LexerParser/cmFortranParser.y
@@ -244,6 +244,7 @@ misc_code:
| RPAREN
| COMMA
| UNTERMINATED_STRING
+| CPP_LINE_DIRECTIVE
;
%%
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=34b7dbbfc37180989b57a0fb25ca4e0010cf992b
commit 34b7dbbfc37180989b57a0fb25ca4e0010cf992b
Author: Kitware Robot <kwrobot at kitware.com>
AuthorDate: Wed Nov 13 11:29:26 2019 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 13 11:29:48 2019 -0500
LexerParser: Regenerate parsers with bison 3.4.2
diff --git a/Source/LexerParser/cmCommandArgumentParser.cxx b/Source/LexerParser/cmCommandArgumentParser.cxx
index ae7fb42ea8..34dc8ecfea 100644
--- a/Source/LexerParser/cmCommandArgumentParser.cxx
+++ b/Source/LexerParser/cmCommandArgumentParser.cxx
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.3.2. */
+/* A Bison parser, made by GNU Bison 3.4.2. */
/* Bison implementation for Yacc-like parsers in C
@@ -48,7 +48,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "3.3.2"
+#define YYBISON_VERSION "3.4.2"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -72,7 +72,7 @@
/* First part of user prologue. */
-#line 1 "cmCommandArgumentParser.y" /* yacc.c:337 */
+#line 1 "cmCommandArgumentParser.y"
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
@@ -134,7 +134,8 @@ static void cmCommandArgument_yyerror(yyscan_t yyscanner, const char* message);
# pragma GCC diagnostic ignored "-Wconversion"
#endif
-#line 138 "cmCommandArgumentParser.cxx" /* yacc.c:337 */
+#line 138 "cmCommandArgumentParser.cxx"
+
# ifndef YY_NULLPTR
# if defined __cplusplus
# if 201103L <= __cplusplus
@@ -155,8 +156,8 @@ static void cmCommandArgument_yyerror(yyscan_t yyscanner, const char* message);
# define YYERROR_VERBOSE 1
#endif
-/* In a future release of Bison, this section will be replaced
- by #include "cmCommandArgumentParserTokens.h". */
+/* Use api.header.include to #include this header
+ instead of duplicating it here. */
#ifndef YY_CMCOMMANDARGUMENT_YY_CMCOMMANDARGUMENTPARSERTOKENS_H_INCLUDED
# define YY_CMCOMMANDARGUMENT_YY_CMCOMMANDARGUMENTPARSERTOKENS_H_INCLUDED
/* Debug traces. */
@@ -310,6 +311,8 @@ typedef short yytype_int16;
#endif
+#define YY_ASSERT(E) ((void) (0 && (E)))
+
#if ! defined yyoverflow || YYERROR_VERBOSE
/* The parser invokes alloca or malloc; define the necessary symbols. */
@@ -700,7 +703,9 @@ yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep, yy
if (yytype < YYNTOKENS)
YYPRINT (yyo, yytoknum[yytype], *yyvaluep);
# endif
+ YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
YYUSE (yytype);
+ YY_IGNORE_MAYBE_UNINITIALIZED_END
}
@@ -1138,6 +1143,8 @@ yynewstate:
| yynewstate -- 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;
if (yyss + yystacksize - 1 <= yyssp)
@@ -1200,8 +1207,6 @@ yysetstate:
}
#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
- YYDPRINTF ((stderr, "Entering state %d\n", yystate));
-
if (yystate == YYFINAL)
YYACCEPT;
@@ -1269,7 +1274,6 @@ yybackup:
YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
*++yyvsp = yylval;
YY_IGNORE_MAYBE_UNINITIALIZED_END
-
goto yynewstate;
@@ -1304,193 +1308,194 @@ yyreduce:
YY_REDUCE_PRINT (yyn);
switch (yyn)
{
- case 2:
-#line 99 "cmCommandArgumentParser.y" /* yacc.c:1652 */
+ case 2:
+#line 99 "cmCommandArgumentParser.y"
{
(yyval.str) = 0;
yyGetParser->SetResult((yyvsp[0].str));
}
-#line 1314 "cmCommandArgumentParser.cxx" /* yacc.c:1652 */
+#line 1318 "cmCommandArgumentParser.cxx"
break;
case 3:
-#line 105 "cmCommandArgumentParser.y" /* yacc.c:1652 */
+#line 105 "cmCommandArgumentParser.y"
{
(yyval.str) = (yyvsp[0].str);
}
-#line 1322 "cmCommandArgumentParser.cxx" /* yacc.c:1652 */
+#line 1326 "cmCommandArgumentParser.cxx"
break;
case 4:
-#line 108 "cmCommandArgumentParser.y" /* yacc.c:1652 */
+#line 108 "cmCommandArgumentParser.y"
{
(yyval.str) = yyGetParser->CombineUnions((yyvsp[-1].str), (yyvsp[0].str));
}
-#line 1330 "cmCommandArgumentParser.cxx" /* yacc.c:1652 */
+#line 1334 "cmCommandArgumentParser.cxx"
break;
case 5:
-#line 113 "cmCommandArgumentParser.y" /* yacc.c:1652 */
+#line 113 "cmCommandArgumentParser.y"
{
(yyval.str) = 0;
}
-#line 1338 "cmCommandArgumentParser.cxx" /* yacc.c:1652 */
+#line 1342 "cmCommandArgumentParser.cxx"
break;
case 6:
-#line 116 "cmCommandArgumentParser.y" /* yacc.c:1652 */
+#line 116 "cmCommandArgumentParser.y"
{
(yyval.str) = yyGetParser->CombineUnions((yyvsp[-1].str), (yyvsp[0].str));
}
-#line 1346 "cmCommandArgumentParser.cxx" /* yacc.c:1652 */
+#line 1350 "cmCommandArgumentParser.cxx"
break;
case 7:
-#line 121 "cmCommandArgumentParser.y" /* yacc.c:1652 */
+#line 121 "cmCommandArgumentParser.y"
{
(yyval.str) = (yyvsp[0].str);
}
-#line 1354 "cmCommandArgumentParser.cxx" /* yacc.c:1652 */
+#line 1358 "cmCommandArgumentParser.cxx"
break;
case 8:
-#line 124 "cmCommandArgumentParser.y" /* yacc.c:1652 */
+#line 124 "cmCommandArgumentParser.y"
{
(yyval.str) = (yyvsp[0].str);
}
-#line 1362 "cmCommandArgumentParser.cxx" /* yacc.c:1652 */
+#line 1366 "cmCommandArgumentParser.cxx"
break;
case 9:
-#line 129 "cmCommandArgumentParser.y" /* yacc.c:1652 */
+#line 129 "cmCommandArgumentParser.y"
{
(yyval.str) = (yyvsp[0].str);
}
-#line 1370 "cmCommandArgumentParser.cxx" /* yacc.c:1652 */
+#line 1374 "cmCommandArgumentParser.cxx"
break;
case 10:
-#line 132 "cmCommandArgumentParser.y" /* yacc.c:1652 */
+#line 132 "cmCommandArgumentParser.y"
{
(yyval.str) = (yyvsp[0].str);
}
-#line 1378 "cmCommandArgumentParser.cxx" /* yacc.c:1652 */
+#line 1382 "cmCommandArgumentParser.cxx"
break;
case 11:
-#line 135 "cmCommandArgumentParser.y" /* yacc.c:1652 */
+#line 135 "cmCommandArgumentParser.y"
{
(yyval.str) = (yyvsp[0].str);
}
-#line 1386 "cmCommandArgumentParser.cxx" /* yacc.c:1652 */
+#line 1390 "cmCommandArgumentParser.cxx"
break;
case 12:
-#line 138 "cmCommandArgumentParser.y" /* yacc.c:1652 */
+#line 138 "cmCommandArgumentParser.y"
{
(yyval.str) = (yyvsp[0].str);
}
-#line 1394 "cmCommandArgumentParser.cxx" /* yacc.c:1652 */
+#line 1398 "cmCommandArgumentParser.cxx"
break;
case 13:
-#line 141 "cmCommandArgumentParser.y" /* yacc.c:1652 */
+#line 141 "cmCommandArgumentParser.y"
{
(yyval.str) = (yyvsp[0].str);
}
-#line 1402 "cmCommandArgumentParser.cxx" /* yacc.c:1652 */
+#line 1406 "cmCommandArgumentParser.cxx"
break;
case 14:
-#line 144 "cmCommandArgumentParser.y" /* yacc.c:1652 */
+#line 144 "cmCommandArgumentParser.y"
{
(yyval.str) = (yyvsp[0].str);
}
-#line 1410 "cmCommandArgumentParser.cxx" /* yacc.c:1652 */
+#line 1414 "cmCommandArgumentParser.cxx"
break;
case 15:
-#line 149 "cmCommandArgumentParser.y" /* yacc.c:1652 */
+#line 149 "cmCommandArgumentParser.y"
{
(yyval.str) = yyGetParser->ExpandSpecialVariable((yyvsp[-2].str), (yyvsp[-1].str));
}
-#line 1418 "cmCommandArgumentParser.cxx" /* yacc.c:1652 */
+#line 1422 "cmCommandArgumentParser.cxx"
break;
case 16:
-#line 152 "cmCommandArgumentParser.y" /* yacc.c:1652 */
+#line 152 "cmCommandArgumentParser.y"
{
(yyval.str) = yyGetParser->ExpandSpecialVariable((yyvsp[-2].str), (yyvsp[-1].str));
}
-#line 1426 "cmCommandArgumentParser.cxx" /* yacc.c:1652 */
+#line 1430 "cmCommandArgumentParser.cxx"
break;
case 17:
-#line 155 "cmCommandArgumentParser.y" /* yacc.c:1652 */
+#line 155 "cmCommandArgumentParser.y"
{
(yyval.str) = yyGetParser->ExpandVariable((yyvsp[-1].str));
}
-#line 1434 "cmCommandArgumentParser.cxx" /* yacc.c:1652 */
+#line 1438 "cmCommandArgumentParser.cxx"
break;
case 18:
-#line 158 "cmCommandArgumentParser.y" /* yacc.c:1652 */
+#line 158 "cmCommandArgumentParser.y"
{
(yyval.str) = yyGetParser->ExpandVariableForAt((yyvsp[0].str));
}
-#line 1442 "cmCommandArgumentParser.cxx" /* yacc.c:1652 */
+#line 1446 "cmCommandArgumentParser.cxx"
break;
case 19:
-#line 163 "cmCommandArgumentParser.y" /* yacc.c:1652 */
+#line 163 "cmCommandArgumentParser.y"
{
(yyval.str) = (yyvsp[0].str);
}
-#line 1450 "cmCommandArgumentParser.cxx" /* yacc.c:1652 */
+#line 1454 "cmCommandArgumentParser.cxx"
break;
case 20:
-#line 166 "cmCommandArgumentParser.y" /* yacc.c:1652 */
+#line 166 "cmCommandArgumentParser.y"
{
(yyval.str) = (yyvsp[-1].str);
}
-#line 1458 "cmCommandArgumentParser.cxx" /* yacc.c:1652 */
+#line 1462 "cmCommandArgumentParser.cxx"
break;
case 21:
-#line 171 "cmCommandArgumentParser.y" /* yacc.c:1652 */
+#line 171 "cmCommandArgumentParser.y"
{
(yyval.str) = 0;
}
-#line 1466 "cmCommandArgumentParser.cxx" /* yacc.c:1652 */
+#line 1470 "cmCommandArgumentParser.cxx"
break;
case 22:
-#line 174 "cmCommandArgumentParser.y" /* yacc.c:1652 */
+#line 174 "cmCommandArgumentParser.y"
{
(yyval.str) = yyGetParser->CombineUnions((yyvsp[-1].str), (yyvsp[0].str));
}
-#line 1474 "cmCommandArgumentParser.cxx" /* yacc.c:1652 */
+#line 1478 "cmCommandArgumentParser.cxx"
break;
case 23:
-#line 179 "cmCommandArgumentParser.y" /* yacc.c:1652 */
+#line 179 "cmCommandArgumentParser.y"
{
(yyval.str) = (yyvsp[0].str);
}
-#line 1482 "cmCommandArgumentParser.cxx" /* yacc.c:1652 */
+#line 1486 "cmCommandArgumentParser.cxx"
break;
case 24:
-#line 182 "cmCommandArgumentParser.y" /* yacc.c:1652 */
+#line 182 "cmCommandArgumentParser.y"
{
(yyval.str) = (yyvsp[0].str);
}
-#line 1490 "cmCommandArgumentParser.cxx" /* yacc.c:1652 */
+#line 1494 "cmCommandArgumentParser.cxx"
break;
-#line 1494 "cmCommandArgumentParser.cxx" /* yacc.c:1652 */
+#line 1498 "cmCommandArgumentParser.cxx"
+
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
@@ -1723,7 +1728,7 @@ yyreturn:
#endif
return yyresult;
}
-#line 187 "cmCommandArgumentParser.y" /* yacc.c:1918 */
+#line 187 "cmCommandArgumentParser.y"
/* End of grammar */
diff --git a/Source/LexerParser/cmCommandArgumentParserTokens.h b/Source/LexerParser/cmCommandArgumentParserTokens.h
index 56c9794f9f..033b8994d1 100644
--- a/Source/LexerParser/cmCommandArgumentParserTokens.h
+++ b/Source/LexerParser/cmCommandArgumentParserTokens.h
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.3.2. */
+/* A Bison parser, made by GNU Bison 3.4.2. */
/* Bison interface for Yacc-like parsers in C
diff --git a/Source/LexerParser/cmDependsJavaParser.cxx b/Source/LexerParser/cmDependsJavaParser.cxx
index 6c1fb2cb37..b15082ddb2 100644
--- a/Source/LexerParser/cmDependsJavaParser.cxx
+++ b/Source/LexerParser/cmDependsJavaParser.cxx
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.3.2. */
+/* A Bison parser, made by GNU Bison 3.4.2. */
/* Bison implementation for Yacc-like parsers in C
@@ -48,7 +48,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "3.3.2"
+#define YYBISON_VERSION "3.4.2"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -72,7 +72,7 @@
/* First part of user prologue. */
-#line 1 "cmDependsJavaParser.y" /* yacc.c:337 */
+#line 1 "cmDependsJavaParser.y"
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
@@ -123,7 +123,8 @@ static void cmDependsJava_yyerror(yyscan_t yyscanner, const char* message);
# pragma GCC diagnostic ignored "-Wconversion"
#endif
-#line 127 "cmDependsJavaParser.cxx" /* yacc.c:337 */
+#line 127 "cmDependsJavaParser.cxx"
+
# ifndef YY_NULLPTR
# if defined __cplusplus
# if 201103L <= __cplusplus
@@ -144,8 +145,8 @@ static void cmDependsJava_yyerror(yyscan_t yyscanner, const char* message);
# define YYERROR_VERBOSE 1
#endif
-/* In a future release of Bison, this section will be replaced
- by #include "cmDependsJavaParserTokens.h". */
+/* Use api.header.include to #include this header
+ instead of duplicating it here. */
#ifndef YY_CMDEPENDSJAVA_YY_CMDEPENDSJAVAPARSERTOKENS_H_INCLUDED
# define YY_CMDEPENDSJAVA_YY_CMDEPENDSJAVAPARSERTOKENS_H_INCLUDED
/* Debug traces. */
@@ -481,6 +482,8 @@ typedef short yytype_int16;
#endif
+#define YY_ASSERT(E) ((void) (0 && (E)))
+
#if ! defined yyoverflow || YYERROR_VERBOSE
/* The parser invokes alloca or malloc; define the necessary symbols. */
@@ -1685,7 +1688,9 @@ yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep, yy
if (yytype < YYNTOKENS)
YYPRINT (yyo, yytoknum[yytype], *yyvaluep);
# endif
+ YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
YYUSE (yytype);
+ YY_IGNORE_MAYBE_UNINITIALIZED_END
}
@@ -2123,6 +2128,8 @@ yynewstate:
| yynewstate -- 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;
if (yyss + yystacksize - 1 <= yyssp)
@@ -2185,8 +2192,6 @@ yysetstate:
}
#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
- YYDPRINTF ((stderr, "Entering state %d\n", yystate));
-
if (yystate == YYFINAL)
YYACCEPT;
@@ -2254,7 +2259,6 @@ yybackup:
YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
*++yyvsp = yylval;
YY_IGNORE_MAYBE_UNINITIALIZED_END
-
goto yynewstate;
@@ -2289,215 +2293,215 @@ yyreduce:
YY_REDUCE_PRINT (yyn);
switch (yyn)
{
- case 2:
-#line 183 "cmDependsJavaParser.y" /* yacc.c:1652 */
+ case 2:
+#line 183 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2301 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2305 "cmDependsJavaParser.cxx"
break;
case 3:
-#line 192 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 192 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2312 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2316 "cmDependsJavaParser.cxx"
break;
case 4:
-#line 200 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 200 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2323 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2327 "cmDependsJavaParser.cxx"
break;
case 5:
-#line 208 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 208 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2334 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2338 "cmDependsJavaParser.cxx"
break;
case 6:
-#line 216 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 216 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2345 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2349 "cmDependsJavaParser.cxx"
break;
case 7:
-#line 224 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 224 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2356 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2360 "cmDependsJavaParser.cxx"
break;
case 8:
-#line 232 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 232 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2367 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2371 "cmDependsJavaParser.cxx"
break;
case 9:
-#line 241 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 241 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2378 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2382 "cmDependsJavaParser.cxx"
break;
case 10:
-#line 249 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 249 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2389 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2393 "cmDependsJavaParser.cxx"
break;
case 11:
-#line 258 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 258 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2400 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2404 "cmDependsJavaParser.cxx"
break;
case 12:
-#line 266 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 266 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2411 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2415 "cmDependsJavaParser.cxx"
break;
case 13:
-#line 275 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 275 "cmDependsJavaParser.y"
{
jpElementStart(0);
}
-#line 2419 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2423 "cmDependsJavaParser.cxx"
break;
case 14:
-#line 280 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 280 "cmDependsJavaParser.y"
{
jpElementStart(0);
}
-#line 2427 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2431 "cmDependsJavaParser.cxx"
break;
case 15:
-#line 285 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 285 "cmDependsJavaParser.y"
{
jpElementStart(0);
}
-#line 2435 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2439 "cmDependsJavaParser.cxx"
break;
case 16:
-#line 290 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 290 "cmDependsJavaParser.y"
{
jpElementStart(0);
}
-#line 2443 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2447 "cmDependsJavaParser.cxx"
break;
case 17:
-#line 295 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 295 "cmDependsJavaParser.y"
{
jpElementStart(0);
}
-#line 2451 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2455 "cmDependsJavaParser.cxx"
break;
case 18:
-#line 300 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 300 "cmDependsJavaParser.y"
{
jpElementStart(0);
}
-#line 2459 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2463 "cmDependsJavaParser.cxx"
break;
case 19:
-#line 305 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 305 "cmDependsJavaParser.y"
{
jpElementStart(0);
}
-#line 2467 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2471 "cmDependsJavaParser.cxx"
break;
case 20:
-#line 310 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 310 "cmDependsJavaParser.y"
{
jpElementStart(0);
}
-#line 2475 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2479 "cmDependsJavaParser.cxx"
break;
case 21:
-#line 316 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 316 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2486 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2490 "cmDependsJavaParser.cxx"
break;
case 22:
-#line 324 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 324 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2497 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2501 "cmDependsJavaParser.cxx"
break;
case 23:
-#line 333 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 333 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpStoreClass((yyvsp[0].str));
@@ -2505,44 +2509,44 @@ yyreduce:
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2509 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2513 "cmDependsJavaParser.cxx"
break;
case 24:
-#line 343 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 343 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2520 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2524 "cmDependsJavaParser.cxx"
break;
case 25:
-#line 352 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 352 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2531 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2535 "cmDependsJavaParser.cxx"
break;
case 26:
-#line 361 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 361 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2542 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2546 "cmDependsJavaParser.cxx"
break;
case 27:
-#line 369 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 369 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpStoreClass((yyvsp[-1].str));
@@ -2550,56 +2554,56 @@ yyreduce:
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2554 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2558 "cmDependsJavaParser.cxx"
break;
case 28:
-#line 379 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 379 "cmDependsJavaParser.y"
{
jpElementStart(1);
(yyval.str) = (yyvsp[0].str);
}
-#line 2563 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2567 "cmDependsJavaParser.cxx"
break;
case 29:
-#line 385 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 385 "cmDependsJavaParser.y"
{
jpElementStart(1);
(yyval.str) = (yyvsp[0].str);
}
-#line 2572 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2576 "cmDependsJavaParser.cxx"
break;
case 30:
-#line 392 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 392 "cmDependsJavaParser.y"
{
jpElementStart(1);
(yyval.str) = (yyvsp[0].str);
}
-#line 2581 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2585 "cmDependsJavaParser.cxx"
break;
case 31:
-#line 399 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 399 "cmDependsJavaParser.y"
{
jpElementStart(1);
(yyval.str) = (yyvsp[0].str);
}
-#line 2590 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2594 "cmDependsJavaParser.cxx"
break;
case 32:
-#line 405 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 405 "cmDependsJavaParser.y"
{
jpElementStart(2);
(yyval.str) = (yyvsp[0].str);
}
-#line 2599 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2603 "cmDependsJavaParser.cxx"
break;
case 33:
-#line 412 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 412 "cmDependsJavaParser.y"
{
jpElementStart(3);
yyGetParser->AddClassFound((yyvsp[-2].str));
@@ -2607,11 +2611,11 @@ yyreduce:
yyGetParser->DeallocateParserType(&((yyvsp[-2].str)));
(yyval.str) = const_cast<char*>(yyGetParser->GetCurrentCombine());
}
-#line 2611 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2615 "cmDependsJavaParser.cxx"
break;
case 34:
-#line 421 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 421 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpStoreClass((yyvsp[-2].str));
@@ -2620,11 +2624,11 @@ yyreduce:
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2624 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2628 "cmDependsJavaParser.cxx"
break;
case 35:
-#line 431 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 431 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpStoreClass((yyvsp[-2].str));
@@ -2633,118 +2637,118 @@ yyreduce:
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2637 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2641 "cmDependsJavaParser.cxx"
break;
case 36:
-#line 441 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 441 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2648 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2652 "cmDependsJavaParser.cxx"
break;
case 37:
-#line 450 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 450 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2659 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2663 "cmDependsJavaParser.cxx"
break;
case 38:
-#line 458 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 458 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2670 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2674 "cmDependsJavaParser.cxx"
break;
case 39:
-#line 467 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 467 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2681 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2685 "cmDependsJavaParser.cxx"
break;
case 40:
-#line 475 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 475 "cmDependsJavaParser.y"
{
jpElementStart(0);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2691 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2695 "cmDependsJavaParser.cxx"
break;
case 41:
-#line 482 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 482 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2702 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2706 "cmDependsJavaParser.cxx"
break;
case 42:
-#line 490 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 490 "cmDependsJavaParser.y"
{
jpElementStart(0);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2712 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2716 "cmDependsJavaParser.cxx"
break;
case 43:
-#line 497 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 497 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2723 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2727 "cmDependsJavaParser.cxx"
break;
case 44:
-#line 505 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 505 "cmDependsJavaParser.y"
{
jpElementStart(0);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2733 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2737 "cmDependsJavaParser.cxx"
break;
case 45:
-#line 512 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 512 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2744 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2748 "cmDependsJavaParser.cxx"
break;
case 46:
-#line 521 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 521 "cmDependsJavaParser.y"
{
jpElementStart(3);
yyGetParser->SetCurrentPackage((yyvsp[-1].str));
@@ -2754,33 +2758,33 @@ yyreduce:
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2758 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2762 "cmDependsJavaParser.cxx"
break;
case 47:
-#line 533 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 533 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2769 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2773 "cmDependsJavaParser.cxx"
break;
case 48:
-#line 541 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 541 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2780 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2784 "cmDependsJavaParser.cxx"
break;
case 49:
-#line 550 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 550 "cmDependsJavaParser.y"
{
jpElementStart(3);
yyGetParser->AddPackagesImport((yyvsp[-1].str));
@@ -2790,11 +2794,11 @@ yyreduce:
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2794 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2798 "cmDependsJavaParser.cxx"
break;
case 50:
-#line 562 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 562 "cmDependsJavaParser.y"
{
jpElementStart(5);
std::string str = (yyvsp[-3].str);
@@ -2805,77 +2809,77 @@ yyreduce:
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2809 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2813 "cmDependsJavaParser.cxx"
break;
case 51:
-#line 575 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 575 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2820 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2824 "cmDependsJavaParser.cxx"
break;
case 52:
-#line 583 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 583 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2831 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2835 "cmDependsJavaParser.cxx"
break;
case 53:
-#line 591 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 591 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2842 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2846 "cmDependsJavaParser.cxx"
break;
case 54:
-#line 600 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 600 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2853 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2857 "cmDependsJavaParser.cxx"
break;
case 55:
-#line 608 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 608 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2864 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2868 "cmDependsJavaParser.cxx"
break;
case 67:
-#line 623 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 623 "cmDependsJavaParser.y"
{
yyGetParser->StartClass((yyvsp[0].str));
jpElementStart(3);
yyGetParser->DeallocateParserType(&((yyvsp[0].str)));
jpCheckEmpty(3);
}
-#line 2875 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2879 "cmDependsJavaParser.cxx"
break;
case 68:
-#line 633 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 633 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
@@ -2883,11 +2887,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
yyGetParser->EndClass();
}
-#line 2887 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2891 "cmDependsJavaParser.cxx"
break;
case 69:
-#line 642 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 642 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(2);
@@ -2895,11 +2899,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
yyGetParser->EndClass();
}
-#line 2899 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2903 "cmDependsJavaParser.cxx"
break;
case 70:
-#line 651 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 651 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -2907,11 +2911,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
yyGetParser->EndClass();
}
-#line 2911 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2915 "cmDependsJavaParser.cxx"
break;
case 71:
-#line 660 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 660 "cmDependsJavaParser.y"
{
jpElementStart(4);
jpCheckEmpty(4);
@@ -2919,226 +2923,226 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
yyGetParser->EndClass();
}
-#line 2923 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2927 "cmDependsJavaParser.cxx"
break;
case 72:
-#line 669 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 669 "cmDependsJavaParser.y"
{
jpElementStart(0);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2933 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2937 "cmDependsJavaParser.cxx"
break;
case 73:
-#line 676 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 676 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2944 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2948 "cmDependsJavaParser.cxx"
break;
case 74:
-#line 685 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 685 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2955 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2959 "cmDependsJavaParser.cxx"
break;
case 75:
-#line 694 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 694 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2966 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2970 "cmDependsJavaParser.cxx"
break;
case 76:
-#line 703 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 703 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2977 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2981 "cmDependsJavaParser.cxx"
break;
case 77:
-#line 711 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 711 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2988 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 2992 "cmDependsJavaParser.cxx"
break;
case 78:
-#line 720 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 720 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 2999 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3003 "cmDependsJavaParser.cxx"
break;
case 79:
-#line 728 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 728 "cmDependsJavaParser.y"
{
jpElementStart(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 3009 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3013 "cmDependsJavaParser.cxx"
break;
case 80:
-#line 735 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 735 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 3020 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3024 "cmDependsJavaParser.cxx"
break;
case 81:
-#line 744 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 744 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 3031 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3035 "cmDependsJavaParser.cxx"
break;
case 82:
-#line 752 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 752 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 3042 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3046 "cmDependsJavaParser.cxx"
break;
case 83:
-#line 760 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 760 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 3053 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3057 "cmDependsJavaParser.cxx"
break;
case 84:
-#line 768 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 768 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 3064 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3068 "cmDependsJavaParser.cxx"
break;
case 85:
-#line 777 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 777 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 3075 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3079 "cmDependsJavaParser.cxx"
break;
case 86:
-#line 785 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 785 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 3086 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3090 "cmDependsJavaParser.cxx"
break;
case 87:
-#line 794 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 794 "cmDependsJavaParser.y"
{
jpElementStart(4);
}
-#line 3094 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3098 "cmDependsJavaParser.cxx"
break;
case 88:
-#line 800 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 800 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 3105 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3109 "cmDependsJavaParser.cxx"
break;
case 89:
-#line 808 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 808 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 3116 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3120 "cmDependsJavaParser.cxx"
break;
case 90:
-#line 817 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 817 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 3127 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3131 "cmDependsJavaParser.cxx"
break;
case 91:
-#line 825 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 825 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 3138 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3142 "cmDependsJavaParser.cxx"
break;
case 92:
-#line 834 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 834 "cmDependsJavaParser.y"
{
jpElementStart(1);
yyGetParser->DeallocateParserType(&((yyvsp[0].str)));
@@ -3146,77 +3150,77 @@ yyreduce:
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 3150 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3154 "cmDependsJavaParser.cxx"
break;
case 93:
-#line 843 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 843 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 3161 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3165 "cmDependsJavaParser.cxx"
break;
case 94:
-#line 852 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 852 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 3172 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3176 "cmDependsJavaParser.cxx"
break;
case 95:
-#line 860 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 860 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 3183 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3187 "cmDependsJavaParser.cxx"
break;
case 96:
-#line 869 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 869 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 3194 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3198 "cmDependsJavaParser.cxx"
break;
case 97:
-#line 877 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 877 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 3205 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3209 "cmDependsJavaParser.cxx"
break;
case 98:
-#line 885 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 885 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 3216 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3220 "cmDependsJavaParser.cxx"
break;
case 99:
-#line 894 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 894 "cmDependsJavaParser.y"
{
jpElementStart(4);
jpCheckEmpty(4);
@@ -3224,11 +3228,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3228 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3232 "cmDependsJavaParser.cxx"
break;
case 100:
-#line 903 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 903 "cmDependsJavaParser.y"
{
jpElementStart(4);
jpCheckEmpty(4);
@@ -3236,22 +3240,22 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3240 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3244 "cmDependsJavaParser.cxx"
break;
case 101:
-#line 912 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 912 "cmDependsJavaParser.y"
{
jpElementStart(0);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 3251 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3255 "cmDependsJavaParser.cxx"
break;
case 102:
-#line 920 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 920 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -3259,11 +3263,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3263 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3267 "cmDependsJavaParser.cxx"
break;
case 103:
-#line 930 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 930 "cmDependsJavaParser.y"
{
jpElementStart(4);
yyGetParser->DeallocateParserType(&((yyvsp[-3].str)));
@@ -3272,40 +3276,40 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3276 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3280 "cmDependsJavaParser.cxx"
break;
case 104:
-#line 940 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 940 "cmDependsJavaParser.y"
{
jpElementStart(3);
}
-#line 3285 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3289 "cmDependsJavaParser.cxx"
break;
case 105:
-#line 946 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 946 "cmDependsJavaParser.y"
{
jpElementStart(0);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 3296 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3300 "cmDependsJavaParser.cxx"
break;
case 107:
-#line 957 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 957 "cmDependsJavaParser.y"
{
jpElementStart(1);
}
-#line 3305 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3309 "cmDependsJavaParser.cxx"
break;
case 108:
-#line 963 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 963 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -3313,11 +3317,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3317 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3321 "cmDependsJavaParser.cxx"
break;
case 109:
-#line 973 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 973 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -3325,11 +3329,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3329 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3333 "cmDependsJavaParser.cxx"
break;
case 110:
-#line 983 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 983 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
@@ -3337,20 +3341,20 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3341 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3345 "cmDependsJavaParser.cxx"
break;
case 111:
-#line 993 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 993 "cmDependsJavaParser.y"
{
jpElementStart(1);
}
-#line 3350 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3354 "cmDependsJavaParser.cxx"
break;
case 112:
-#line 999 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 999 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -3358,11 +3362,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3362 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3366 "cmDependsJavaParser.cxx"
break;
case 113:
-#line 1009 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1009 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -3370,11 +3374,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3374 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3378 "cmDependsJavaParser.cxx"
break;
case 114:
-#line 1019 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1019 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
@@ -3382,11 +3386,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3386 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3390 "cmDependsJavaParser.cxx"
break;
case 115:
-#line 1029 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1029 "cmDependsJavaParser.y"
{
jpElementStart(4);
jpCheckEmpty(4);
@@ -3394,11 +3398,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3398 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3402 "cmDependsJavaParser.cxx"
break;
case 116:
-#line 1038 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1038 "cmDependsJavaParser.y"
{
jpElementStart(5);
jpCheckEmpty(5);
@@ -3406,11 +3410,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3410 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3414 "cmDependsJavaParser.cxx"
break;
case 117:
-#line 1048 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1048 "cmDependsJavaParser.y"
{
jpElementStart(4);
yyGetParser->DeallocateParserType(&((yyvsp[-3].str)));
@@ -3419,11 +3423,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3423 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3427 "cmDependsJavaParser.cxx"
break;
case 118:
-#line 1059 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1059 "cmDependsJavaParser.y"
{
jpElementStart(4);
jpCheckEmpty(4);
@@ -3431,22 +3435,22 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3435 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3439 "cmDependsJavaParser.cxx"
break;
case 119:
-#line 1068 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1068 "cmDependsJavaParser.y"
{
jpElementStart(0);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 3446 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3450 "cmDependsJavaParser.cxx"
break;
case 120:
-#line 1076 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1076 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
@@ -3454,11 +3458,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3458 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3462 "cmDependsJavaParser.cxx"
break;
case 121:
-#line 1086 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1086 "cmDependsJavaParser.y"
{
jpElementStart(5);
jpCheckEmpty(5);
@@ -3466,11 +3470,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3470 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3474 "cmDependsJavaParser.cxx"
break;
case 122:
-#line 1095 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1095 "cmDependsJavaParser.y"
{
jpElementStart(5);
jpCheckEmpty(5);
@@ -3478,22 +3482,22 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3482 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3486 "cmDependsJavaParser.cxx"
break;
case 123:
-#line 1105 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1105 "cmDependsJavaParser.y"
{
yyGetParser->StartClass((yyvsp[0].str));
jpElementStart(3);
yyGetParser->DeallocateParserType(&((yyvsp[0].str)));
jpCheckEmpty(3);
}
-#line 3493 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3497 "cmDependsJavaParser.cxx"
break;
case 124:
-#line 1114 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1114 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
@@ -3501,21 +3505,21 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
yyGetParser->EndClass();
}
-#line 3505 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3509 "cmDependsJavaParser.cxx"
break;
case 125:
-#line 1123 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1123 "cmDependsJavaParser.y"
{
jpElementStart(0);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 3515 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3519 "cmDependsJavaParser.cxx"
break;
case 126:
-#line 1130 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1130 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -3523,11 +3527,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3527 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3531 "cmDependsJavaParser.cxx"
break;
case 127:
-#line 1140 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1140 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
@@ -3535,11 +3539,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3539 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3543 "cmDependsJavaParser.cxx"
break;
case 128:
-#line 1149 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1149 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -3547,11 +3551,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3551 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3555 "cmDependsJavaParser.cxx"
break;
case 129:
-#line 1159 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1159 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -3559,33 +3563,33 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3563 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3567 "cmDependsJavaParser.cxx"
break;
case 130:
-#line 1168 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1168 "cmDependsJavaParser.y"
{
jpElementStart(0);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 3574 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3578 "cmDependsJavaParser.cxx"
break;
case 131:
-#line 1176 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1176 "cmDependsJavaParser.y"
{
jpElementStart(2);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 3585 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3589 "cmDependsJavaParser.cxx"
break;
case 132:
-#line 1185 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1185 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -3593,11 +3597,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3597 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3601 "cmDependsJavaParser.cxx"
break;
case 133:
-#line 1194 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1194 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -3605,11 +3609,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3609 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3613 "cmDependsJavaParser.cxx"
break;
case 134:
-#line 1203 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1203 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -3617,22 +3621,22 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3621 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3625 "cmDependsJavaParser.cxx"
break;
case 135:
-#line 1212 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1212 "cmDependsJavaParser.y"
{
jpElementStart(2);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 3632 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3636 "cmDependsJavaParser.cxx"
break;
case 136:
-#line 1220 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1220 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -3640,22 +3644,22 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3644 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3648 "cmDependsJavaParser.cxx"
break;
case 137:
-#line 1229 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1229 "cmDependsJavaParser.y"
{
jpElementStart(2);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 3655 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3659 "cmDependsJavaParser.cxx"
break;
case 138:
-#line 1238 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1238 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -3663,11 +3667,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3667 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3671 "cmDependsJavaParser.cxx"
break;
case 139:
-#line 1248 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1248 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
@@ -3675,11 +3679,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3679 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3683 "cmDependsJavaParser.cxx"
break;
case 140:
-#line 1258 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1258 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -3687,11 +3691,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3691 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3695 "cmDependsJavaParser.cxx"
break;
case 141:
-#line 1267 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1267 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
@@ -3699,11 +3703,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3703 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3707 "cmDependsJavaParser.cxx"
break;
case 142:
-#line 1277 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1277 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -3711,22 +3715,22 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3715 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3719 "cmDependsJavaParser.cxx"
break;
case 143:
-#line 1286 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1286 "cmDependsJavaParser.y"
{
jpElementStart(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 3726 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3730 "cmDependsJavaParser.cxx"
break;
case 144:
-#line 1294 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1294 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -3734,11 +3738,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3738 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3742 "cmDependsJavaParser.cxx"
break;
case 145:
-#line 1303 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1303 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
@@ -3746,11 +3750,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3750 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3754 "cmDependsJavaParser.cxx"
break;
case 146:
-#line 1313 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1313 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -3758,11 +3762,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3762 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3766 "cmDependsJavaParser.cxx"
break;
case 147:
-#line 1322 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1322 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -3770,33 +3774,33 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3774 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3778 "cmDependsJavaParser.cxx"
break;
case 148:
-#line 1332 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1332 "cmDependsJavaParser.y"
{
jpElementStart(4);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 3785 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3789 "cmDependsJavaParser.cxx"
break;
case 149:
-#line 1340 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1340 "cmDependsJavaParser.y"
{
jpElementStart(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 3796 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3800 "cmDependsJavaParser.cxx"
break;
case 150:
-#line 1348 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1348 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -3804,11 +3808,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3808 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3812 "cmDependsJavaParser.cxx"
break;
case 151:
-#line 1358 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1358 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -3816,11 +3820,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3820 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3824 "cmDependsJavaParser.cxx"
break;
case 152:
-#line 1367 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1367 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(2);
@@ -3828,11 +3832,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3832 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3836 "cmDependsJavaParser.cxx"
break;
case 153:
-#line 1377 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1377 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -3840,11 +3844,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3844 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3848 "cmDependsJavaParser.cxx"
break;
case 154:
-#line 1386 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1386 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -3852,11 +3856,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3856 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3860 "cmDependsJavaParser.cxx"
break;
case 155:
-#line 1395 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1395 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -3864,11 +3868,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3868 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3872 "cmDependsJavaParser.cxx"
break;
case 156:
-#line 1405 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1405 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(2);
@@ -3876,11 +3880,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3880 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3884 "cmDependsJavaParser.cxx"
break;
case 157:
-#line 1415 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1415 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(3);
@@ -3888,11 +3892,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3892 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3896 "cmDependsJavaParser.cxx"
break;
case 158:
-#line 1424 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1424 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(2);
@@ -3900,11 +3904,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3904 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3908 "cmDependsJavaParser.cxx"
break;
case 159:
-#line 1434 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1434 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -3912,11 +3916,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3916 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3920 "cmDependsJavaParser.cxx"
break;
case 160:
-#line 1443 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1443 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -3924,11 +3928,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3928 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3932 "cmDependsJavaParser.cxx"
break;
case 161:
-#line 1452 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1452 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -3936,11 +3940,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3940 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3944 "cmDependsJavaParser.cxx"
break;
case 162:
-#line 1461 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1461 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -3948,11 +3952,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3952 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3956 "cmDependsJavaParser.cxx"
break;
case 163:
-#line 1470 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1470 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -3960,11 +3964,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3964 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3968 "cmDependsJavaParser.cxx"
break;
case 164:
-#line 1479 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1479 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -3972,11 +3976,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3976 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3980 "cmDependsJavaParser.cxx"
break;
case 165:
-#line 1489 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1489 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -3984,11 +3988,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 3988 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 3992 "cmDependsJavaParser.cxx"
break;
case 166:
-#line 1498 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1498 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -3996,11 +4000,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4000 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4004 "cmDependsJavaParser.cxx"
break;
case 167:
-#line 1507 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1507 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4008,11 +4012,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4012 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4016 "cmDependsJavaParser.cxx"
break;
case 168:
-#line 1516 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1516 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4020,11 +4024,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4024 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4028 "cmDependsJavaParser.cxx"
break;
case 169:
-#line 1525 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1525 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4032,11 +4036,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4036 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4040 "cmDependsJavaParser.cxx"
break;
case 170:
-#line 1535 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1535 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4044,11 +4048,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4048 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4052 "cmDependsJavaParser.cxx"
break;
case 171:
-#line 1544 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1544 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4056,11 +4060,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4060 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4064 "cmDependsJavaParser.cxx"
break;
case 172:
-#line 1553 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1553 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4068,11 +4072,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4072 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4076 "cmDependsJavaParser.cxx"
break;
case 173:
-#line 1562 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1562 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4080,11 +4084,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4084 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4088 "cmDependsJavaParser.cxx"
break;
case 174:
-#line 1571 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1571 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4092,11 +4096,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4096 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4100 "cmDependsJavaParser.cxx"
break;
case 175:
-#line 1580 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1580 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4104,11 +4108,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4108 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4112 "cmDependsJavaParser.cxx"
break;
case 176:
-#line 1589 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1589 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4116,11 +4120,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4120 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4124 "cmDependsJavaParser.cxx"
break;
case 177:
-#line 1598 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1598 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4128,11 +4132,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4132 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4136 "cmDependsJavaParser.cxx"
break;
case 178:
-#line 1607 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1607 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4140,11 +4144,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4144 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4148 "cmDependsJavaParser.cxx"
break;
case 179:
-#line 1616 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1616 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4152,11 +4156,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4156 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4160 "cmDependsJavaParser.cxx"
break;
case 180:
-#line 1625 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1625 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4164,11 +4168,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4168 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4172 "cmDependsJavaParser.cxx"
break;
case 181:
-#line 1634 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1634 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4176,11 +4180,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4180 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4184 "cmDependsJavaParser.cxx"
break;
case 182:
-#line 1644 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1644 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4188,11 +4192,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4192 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4196 "cmDependsJavaParser.cxx"
break;
case 183:
-#line 1654 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1654 "cmDependsJavaParser.y"
{
jpElementStart(3);
yyGetParser->DeallocateParserType(&((yyvsp[-2].str)));
@@ -4201,11 +4205,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4205 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4209 "cmDependsJavaParser.cxx"
break;
case 184:
-#line 1665 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1665 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -4213,11 +4217,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4217 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4221 "cmDependsJavaParser.cxx"
break;
case 185:
-#line 1675 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1675 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
@@ -4225,11 +4229,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4229 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4233 "cmDependsJavaParser.cxx"
break;
case 186:
-#line 1685 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1685 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4237,11 +4241,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4241 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4245 "cmDependsJavaParser.cxx"
break;
case 187:
-#line 1694 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1694 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4249,11 +4253,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4253 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4257 "cmDependsJavaParser.cxx"
break;
case 188:
-#line 1703 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1703 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4261,11 +4265,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4265 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4269 "cmDependsJavaParser.cxx"
break;
case 189:
-#line 1712 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1712 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4273,11 +4277,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4277 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4281 "cmDependsJavaParser.cxx"
break;
case 190:
-#line 1721 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1721 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4285,11 +4289,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4289 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4293 "cmDependsJavaParser.cxx"
break;
case 191:
-#line 1730 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1730 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4297,11 +4301,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4301 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4305 "cmDependsJavaParser.cxx"
break;
case 192:
-#line 1739 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1739 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4309,11 +4313,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4313 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4317 "cmDependsJavaParser.cxx"
break;
case 193:
-#line 1749 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1749 "cmDependsJavaParser.y"
{
jpElementStart(5);
jpCheckEmpty(5);
@@ -4321,11 +4325,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4325 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4329 "cmDependsJavaParser.cxx"
break;
case 194:
-#line 1759 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1759 "cmDependsJavaParser.y"
{
jpElementStart(7);
jpCheckEmpty(7);
@@ -4333,11 +4337,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4337 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4341 "cmDependsJavaParser.cxx"
break;
case 195:
-#line 1769 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1769 "cmDependsJavaParser.y"
{
jpElementStart(7);
jpCheckEmpty(7);
@@ -4345,40 +4349,40 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4349 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4353 "cmDependsJavaParser.cxx"
break;
case 196:
-#line 1779 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1779 "cmDependsJavaParser.y"
{
jpElementStart(5);
}
-#line 4358 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4362 "cmDependsJavaParser.cxx"
break;
case 197:
-#line 1786 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1786 "cmDependsJavaParser.y"
{
jpElementStart(4);
}
-#line 4367 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4371 "cmDependsJavaParser.cxx"
break;
case 198:
-#line 1792 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1792 "cmDependsJavaParser.y"
{
jpElementStart(0);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 4378 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4382 "cmDependsJavaParser.cxx"
break;
case 199:
-#line 1800 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1800 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4386,22 +4390,22 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4390 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4394 "cmDependsJavaParser.cxx"
break;
case 200:
-#line 1809 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1809 "cmDependsJavaParser.y"
{
jpElementStart(0);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 4401 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4405 "cmDependsJavaParser.cxx"
break;
case 201:
-#line 1817 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1817 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
@@ -4409,11 +4413,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4413 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4417 "cmDependsJavaParser.cxx"
break;
case 202:
-#line 1827 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1827 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
@@ -4421,11 +4425,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4425 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4429 "cmDependsJavaParser.cxx"
break;
case 203:
-#line 1837 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1837 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4433,11 +4437,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4437 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4441 "cmDependsJavaParser.cxx"
break;
case 204:
-#line 1846 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1846 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
@@ -4445,11 +4449,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4449 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4453 "cmDependsJavaParser.cxx"
break;
case 205:
-#line 1856 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1856 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -4457,11 +4461,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4461 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4465 "cmDependsJavaParser.cxx"
break;
case 206:
-#line 1865 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1865 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
@@ -4469,58 +4473,58 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4473 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4477 "cmDependsJavaParser.cxx"
break;
case 207:
-#line 1875 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1875 "cmDependsJavaParser.y"
{
jpElementStart(5);
}
-#line 4482 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4486 "cmDependsJavaParser.cxx"
break;
case 208:
-#line 1882 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1882 "cmDependsJavaParser.y"
{
jpElementStart(5);
}
-#line 4491 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4495 "cmDependsJavaParser.cxx"
break;
case 209:
-#line 1889 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1889 "cmDependsJavaParser.y"
{
jpElementStart(7);
}
-#line 4500 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4504 "cmDependsJavaParser.cxx"
break;
case 210:
-#line 1897 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1897 "cmDependsJavaParser.y"
{
jpElementStart(9);
}
-#line 4509 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4513 "cmDependsJavaParser.cxx"
break;
case 211:
-#line 1903 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1903 "cmDependsJavaParser.y"
{
jpElementStart(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 4520 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4524 "cmDependsJavaParser.cxx"
break;
case 212:
-#line 1911 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1911 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4528,22 +4532,22 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4532 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4536 "cmDependsJavaParser.cxx"
break;
case 213:
-#line 1920 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1920 "cmDependsJavaParser.y"
{
jpElementStart(0);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 4543 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4547 "cmDependsJavaParser.cxx"
break;
case 214:
-#line 1928 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1928 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4551,33 +4555,33 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4555 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4559 "cmDependsJavaParser.cxx"
break;
case 215:
-#line 1939 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1939 "cmDependsJavaParser.y"
{
jpElementStart(9);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 4566 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4570 "cmDependsJavaParser.cxx"
break;
case 216:
-#line 1947 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1947 "cmDependsJavaParser.y"
{
jpElementStart(0);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 4577 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4581 "cmDependsJavaParser.cxx"
break;
case 217:
-#line 1955 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1955 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4585,11 +4589,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4589 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4593 "cmDependsJavaParser.cxx"
break;
case 218:
-#line 1965 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1965 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4597,11 +4601,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4601 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4605 "cmDependsJavaParser.cxx"
break;
case 219:
-#line 1974 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1974 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4609,11 +4613,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4613 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4617 "cmDependsJavaParser.cxx"
break;
case 220:
-#line 1984 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1984 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4621,11 +4625,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4625 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4629 "cmDependsJavaParser.cxx"
break;
case 221:
-#line 1994 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 1994 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4633,11 +4637,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4637 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4641 "cmDependsJavaParser.cxx"
break;
case 222:
-#line 2003 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2003 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -4645,11 +4649,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4649 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4653 "cmDependsJavaParser.cxx"
break;
case 223:
-#line 2013 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2013 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -4657,11 +4661,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4661 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4665 "cmDependsJavaParser.cxx"
break;
case 224:
-#line 2022 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2022 "cmDependsJavaParser.y"
{
jpElementStart(5);
jpCheckEmpty(5);
@@ -4669,11 +4673,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4673 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4677 "cmDependsJavaParser.cxx"
break;
case 225:
-#line 2032 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2032 "cmDependsJavaParser.y"
{
jpElementStart(3);
yyGetParser->DeallocateParserType(&((yyvsp[-1].str)));
@@ -4682,31 +4686,31 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4686 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4690 "cmDependsJavaParser.cxx"
break;
case 226:
-#line 2042 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2042 "cmDependsJavaParser.y"
{
jpElementStart(0);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 4697 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4701 "cmDependsJavaParser.cxx"
break;
case 227:
-#line 2050 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2050 "cmDependsJavaParser.y"
{
jpElementStart(1);
}
-#line 4706 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4710 "cmDependsJavaParser.cxx"
break;
case 228:
-#line 2057 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2057 "cmDependsJavaParser.y"
{
jpElementStart(3);
yyGetParser->DeallocateParserType(&((yyvsp[-1].str)));
@@ -4715,11 +4719,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4719 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4723 "cmDependsJavaParser.cxx"
break;
case 229:
-#line 2068 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2068 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -4727,11 +4731,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4731 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4735 "cmDependsJavaParser.cxx"
break;
case 230:
-#line 2078 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2078 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -4739,11 +4743,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4743 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4747 "cmDependsJavaParser.cxx"
break;
case 231:
-#line 2088 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2088 "cmDependsJavaParser.y"
{
jpElementStart(5);
jpCheckEmpty(5);
@@ -4751,11 +4755,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4755 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4759 "cmDependsJavaParser.cxx"
break;
case 232:
-#line 2098 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2098 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -4763,11 +4767,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4767 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4771 "cmDependsJavaParser.cxx"
break;
case 233:
-#line 2107 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2107 "cmDependsJavaParser.y"
{
jpElementStart(4);
jpCheckEmpty(4);
@@ -4775,22 +4779,22 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4779 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4783 "cmDependsJavaParser.cxx"
break;
case 234:
-#line 2116 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2116 "cmDependsJavaParser.y"
{
jpElementStart(1);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 4790 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4794 "cmDependsJavaParser.cxx"
break;
case 235:
-#line 2124 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2124 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4798,11 +4802,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4802 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4806 "cmDependsJavaParser.cxx"
break;
case 236:
-#line 2134 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2134 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4810,11 +4814,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4814 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4818 "cmDependsJavaParser.cxx"
break;
case 237:
-#line 2143 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2143 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
@@ -4822,20 +4826,20 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4826 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4830 "cmDependsJavaParser.cxx"
break;
case 238:
-#line 2153 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2153 "cmDependsJavaParser.y"
{
jpElementStart(5);
}
-#line 4835 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4839 "cmDependsJavaParser.cxx"
break;
case 239:
-#line 2160 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2160 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
@@ -4843,11 +4847,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4847 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4851 "cmDependsJavaParser.cxx"
break;
case 240:
-#line 2170 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2170 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4855,11 +4859,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4859 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4863 "cmDependsJavaParser.cxx"
break;
case 241:
-#line 2179 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2179 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4867,11 +4871,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4871 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4875 "cmDependsJavaParser.cxx"
break;
case 242:
-#line 2189 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2189 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4879,20 +4883,20 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4883 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4887 "cmDependsJavaParser.cxx"
break;
case 243:
-#line 2198 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2198 "cmDependsJavaParser.y"
{
jpElementStart(1);
}
-#line 4892 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4896 "cmDependsJavaParser.cxx"
break;
case 244:
-#line 2204 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2204 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -4900,11 +4904,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4904 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4908 "cmDependsJavaParser.cxx"
break;
case 245:
-#line 2213 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2213 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4912,11 +4916,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4916 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4920 "cmDependsJavaParser.cxx"
break;
case 246:
-#line 2222 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2222 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4924,11 +4928,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4928 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4932 "cmDependsJavaParser.cxx"
break;
case 247:
-#line 2231 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2231 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4936,11 +4940,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4940 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4944 "cmDependsJavaParser.cxx"
break;
case 248:
-#line 2240 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2240 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4948,11 +4952,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4952 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4956 "cmDependsJavaParser.cxx"
break;
case 249:
-#line 2250 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2250 "cmDependsJavaParser.y"
{
jpElementStart(6);
jpCheckEmpty(6);
@@ -4960,22 +4964,22 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4964 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4968 "cmDependsJavaParser.cxx"
break;
case 250:
-#line 2259 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2259 "cmDependsJavaParser.y"
{
jpElementStart(0);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 4975 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4979 "cmDependsJavaParser.cxx"
break;
case 251:
-#line 2267 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2267 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -4983,22 +4987,22 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 4987 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 4991 "cmDependsJavaParser.cxx"
break;
case 252:
-#line 2276 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2276 "cmDependsJavaParser.y"
{
jpElementStart(0);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 4998 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5002 "cmDependsJavaParser.cxx"
break;
case 253:
-#line 2284 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2284 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -5006,11 +5010,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5010 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5014 "cmDependsJavaParser.cxx"
break;
case 254:
-#line 2294 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2294 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -5018,11 +5022,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5022 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5026 "cmDependsJavaParser.cxx"
break;
case 255:
-#line 2303 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2303 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -5030,11 +5034,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5034 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5038 "cmDependsJavaParser.cxx"
break;
case 256:
-#line 2313 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2313 "cmDependsJavaParser.y"
{
jpElementStart(4);
jpCheckEmpty(4);
@@ -5042,11 +5046,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5046 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5050 "cmDependsJavaParser.cxx"
break;
case 257:
-#line 2322 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2322 "cmDependsJavaParser.y"
{
jpElementStart(4);
jpCheckEmpty(4);
@@ -5054,11 +5058,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5058 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5062 "cmDependsJavaParser.cxx"
break;
case 258:
-#line 2331 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2331 "cmDependsJavaParser.y"
{
jpElementStart(4);
jpCheckEmpty(4);
@@ -5066,11 +5070,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5070 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5074 "cmDependsJavaParser.cxx"
break;
case 259:
-#line 2340 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2340 "cmDependsJavaParser.y"
{
jpElementStart(4);
jpCheckEmpty(4);
@@ -5078,22 +5082,22 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5082 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5086 "cmDependsJavaParser.cxx"
break;
case 260:
-#line 2349 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2349 "cmDependsJavaParser.y"
{
jpElementStart(0);
(yyval.str) = 0;
yyGetParser->SetCurrentCombine("");
}
-#line 5093 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5097 "cmDependsJavaParser.cxx"
break;
case 261:
-#line 2357 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2357 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -5101,11 +5105,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5105 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5109 "cmDependsJavaParser.cxx"
break;
case 262:
-#line 2367 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2367 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -5113,11 +5117,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5117 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5121 "cmDependsJavaParser.cxx"
break;
case 263:
-#line 2376 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2376 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
@@ -5125,11 +5129,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5129 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5133 "cmDependsJavaParser.cxx"
break;
case 264:
-#line 2386 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2386 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -5137,29 +5141,29 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5141 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5145 "cmDependsJavaParser.cxx"
break;
case 265:
-#line 2396 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2396 "cmDependsJavaParser.y"
{
jpElementStart(2);
}
-#line 5150 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5154 "cmDependsJavaParser.cxx"
break;
case 266:
-#line 2402 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2402 "cmDependsJavaParser.y"
{
jpElementStart(3);
}
-#line 5159 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5163 "cmDependsJavaParser.cxx"
break;
case 267:
-#line 2409 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2409 "cmDependsJavaParser.y"
{
jpElementStart(3);
yyGetParser->DeallocateParserType(&((yyvsp[0].str)));
@@ -5168,11 +5172,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5172 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5176 "cmDependsJavaParser.cxx"
break;
case 268:
-#line 2419 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2419 "cmDependsJavaParser.y"
{
jpElementStart(3);
yyGetParser->DeallocateParserType(&((yyvsp[0].str)));
@@ -5181,11 +5185,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5185 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5189 "cmDependsJavaParser.cxx"
break;
case 269:
-#line 2429 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2429 "cmDependsJavaParser.y"
{
jpElementStart(3);
yyGetParser->DeallocateParserType(&((yyvsp[0].str)));
@@ -5194,11 +5198,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5198 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5202 "cmDependsJavaParser.cxx"
break;
case 270:
-#line 2439 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2439 "cmDependsJavaParser.y"
{
jpElementStart(3);
yyGetParser->DeallocateParserType(&((yyvsp[0].str)));
@@ -5207,11 +5211,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5211 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5215 "cmDependsJavaParser.cxx"
break;
case 271:
-#line 2450 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2450 "cmDependsJavaParser.y"
{
jpElementStart(4);
yyGetParser->DeallocateParserType(&((yyvsp[-3].str)));
@@ -5220,11 +5224,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5224 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5228 "cmDependsJavaParser.cxx"
break;
case 272:
-#line 2460 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2460 "cmDependsJavaParser.y"
{
jpElementStart(6);
yyGetParser->DeallocateParserType(&((yyvsp[-5].str)));
@@ -5234,11 +5238,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5238 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5242 "cmDependsJavaParser.cxx"
break;
case 273:
-#line 2471 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2471 "cmDependsJavaParser.y"
{
jpElementStart(6);
yyGetParser->DeallocateParserType(&((yyvsp[-3].str)));
@@ -5247,11 +5251,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5251 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5255 "cmDependsJavaParser.cxx"
break;
case 274:
-#line 2481 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2481 "cmDependsJavaParser.y"
{
jpElementStart(6);
yyGetParser->DeallocateParserType(&((yyvsp[-3].str)));
@@ -5260,11 +5264,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5264 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5268 "cmDependsJavaParser.cxx"
break;
case 275:
-#line 2492 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2492 "cmDependsJavaParser.y"
{
jpElementStart(4);
yyGetParser->DeallocateParserType(&((yyvsp[-3].str)));
@@ -5273,11 +5277,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5277 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5281 "cmDependsJavaParser.cxx"
break;
case 276:
-#line 2502 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2502 "cmDependsJavaParser.y"
{
jpElementStart(4);
jpCheckEmpty(4);
@@ -5285,11 +5289,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5289 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5293 "cmDependsJavaParser.cxx"
break;
case 277:
-#line 2512 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2512 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -5297,11 +5301,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5301 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5305 "cmDependsJavaParser.cxx"
break;
case 278:
-#line 2521 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2521 "cmDependsJavaParser.y"
{
jpElementStart(1);
yyGetParser->DeallocateParserType(&((yyvsp[0].str)));
@@ -5309,11 +5313,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5313 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5317 "cmDependsJavaParser.cxx"
break;
case 279:
-#line 2530 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2530 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -5321,11 +5325,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5325 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5329 "cmDependsJavaParser.cxx"
break;
case 280:
-#line 2539 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2539 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -5333,11 +5337,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5337 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5341 "cmDependsJavaParser.cxx"
break;
case 281:
-#line 2548 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2548 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -5345,11 +5349,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5349 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5353 "cmDependsJavaParser.cxx"
break;
case 282:
-#line 2558 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2558 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
@@ -5357,11 +5361,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5361 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5365 "cmDependsJavaParser.cxx"
break;
case 283:
-#line 2568 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2568 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
@@ -5369,11 +5373,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5373 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5377 "cmDependsJavaParser.cxx"
break;
case 284:
-#line 2578 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2578 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -5381,11 +5385,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5385 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5389 "cmDependsJavaParser.cxx"
break;
case 285:
-#line 2587 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2587 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -5393,11 +5397,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5397 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5401 "cmDependsJavaParser.cxx"
break;
case 286:
-#line 2596 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2596 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
@@ -5405,11 +5409,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5409 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5413 "cmDependsJavaParser.cxx"
break;
case 287:
-#line 2605 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2605 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
@@ -5417,11 +5421,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5421 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5425 "cmDependsJavaParser.cxx"
break;
case 288:
-#line 2614 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2614 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -5429,11 +5433,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5433 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5437 "cmDependsJavaParser.cxx"
break;
case 289:
-#line 2624 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2624 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
@@ -5441,11 +5445,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5445 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5449 "cmDependsJavaParser.cxx"
break;
case 290:
-#line 2634 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2634 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
@@ -5453,11 +5457,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5457 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5461 "cmDependsJavaParser.cxx"
break;
case 291:
-#line 2644 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2644 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -5465,11 +5469,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5469 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5473 "cmDependsJavaParser.cxx"
break;
case 292:
-#line 2653 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2653 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
@@ -5477,11 +5481,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5481 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5485 "cmDependsJavaParser.cxx"
break;
case 293:
-#line 2662 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2662 "cmDependsJavaParser.y"
{
jpElementStart(2);
jpCheckEmpty(2);
@@ -5489,11 +5493,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5493 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5497 "cmDependsJavaParser.cxx"
break;
case 294:
-#line 2671 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2671 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -5501,11 +5505,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5505 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5509 "cmDependsJavaParser.cxx"
break;
case 295:
-#line 2681 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2681 "cmDependsJavaParser.y"
{
jpElementStart(5);
jpCheckEmpty(5);
@@ -5513,11 +5517,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5517 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5521 "cmDependsJavaParser.cxx"
break;
case 296:
-#line 2690 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2690 "cmDependsJavaParser.y"
{
jpElementStart(4);
jpCheckEmpty(4);
@@ -5525,20 +5529,20 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5529 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5533 "cmDependsJavaParser.cxx"
break;
case 297:
-#line 2699 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2699 "cmDependsJavaParser.y"
{
jpElementStart(5);
}
-#line 5538 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5542 "cmDependsJavaParser.cxx"
break;
case 298:
-#line 2706 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2706 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -5546,11 +5550,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5550 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5554 "cmDependsJavaParser.cxx"
break;
case 299:
-#line 2715 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2715 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -5558,11 +5562,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5562 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5566 "cmDependsJavaParser.cxx"
break;
case 300:
-#line 2724 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2724 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -5570,11 +5574,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5574 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5578 "cmDependsJavaParser.cxx"
break;
case 301:
-#line 2733 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2733 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -5582,11 +5586,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5586 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5590 "cmDependsJavaParser.cxx"
break;
case 302:
-#line 2743 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2743 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -5594,11 +5598,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5598 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5602 "cmDependsJavaParser.cxx"
break;
case 303:
-#line 2752 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2752 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -5606,11 +5610,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5610 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5614 "cmDependsJavaParser.cxx"
break;
case 304:
-#line 2761 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2761 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -5618,11 +5622,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5622 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5626 "cmDependsJavaParser.cxx"
break;
case 305:
-#line 2771 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2771 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -5630,11 +5634,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5634 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5638 "cmDependsJavaParser.cxx"
break;
case 306:
-#line 2780 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2780 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -5642,11 +5646,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5646 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5650 "cmDependsJavaParser.cxx"
break;
case 307:
-#line 2789 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2789 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -5654,11 +5658,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5658 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5662 "cmDependsJavaParser.cxx"
break;
case 308:
-#line 2798 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2798 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -5666,11 +5670,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5670 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5674 "cmDependsJavaParser.cxx"
break;
case 309:
-#line 2808 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2808 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -5678,11 +5682,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5682 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5686 "cmDependsJavaParser.cxx"
break;
case 310:
-#line 2817 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2817 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -5690,11 +5694,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5694 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5698 "cmDependsJavaParser.cxx"
break;
case 311:
-#line 2826 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2826 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -5702,11 +5706,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5706 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5710 "cmDependsJavaParser.cxx"
break;
case 312:
-#line 2835 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2835 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -5714,11 +5718,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5718 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5722 "cmDependsJavaParser.cxx"
break;
case 313:
-#line 2844 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2844 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -5726,11 +5730,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5730 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5734 "cmDependsJavaParser.cxx"
break;
case 314:
-#line 2853 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2853 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -5738,11 +5742,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5742 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5746 "cmDependsJavaParser.cxx"
break;
case 315:
-#line 2863 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2863 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -5750,11 +5754,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5754 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5758 "cmDependsJavaParser.cxx"
break;
case 316:
-#line 2872 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2872 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -5762,11 +5766,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5766 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5770 "cmDependsJavaParser.cxx"
break;
case 317:
-#line 2881 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2881 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -5774,11 +5778,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5778 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5782 "cmDependsJavaParser.cxx"
break;
case 318:
-#line 2891 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2891 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -5786,11 +5790,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5790 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5794 "cmDependsJavaParser.cxx"
break;
case 319:
-#line 2900 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2900 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -5798,11 +5802,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5802 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5806 "cmDependsJavaParser.cxx"
break;
case 320:
-#line 2910 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2910 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -5810,11 +5814,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5814 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5818 "cmDependsJavaParser.cxx"
break;
case 321:
-#line 2919 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2919 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -5822,11 +5826,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5826 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5830 "cmDependsJavaParser.cxx"
break;
case 322:
-#line 2929 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2929 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -5834,11 +5838,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5838 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5842 "cmDependsJavaParser.cxx"
break;
case 323:
-#line 2938 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2938 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -5846,11 +5850,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5850 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5854 "cmDependsJavaParser.cxx"
break;
case 324:
-#line 2948 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2948 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -5858,11 +5862,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5862 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5866 "cmDependsJavaParser.cxx"
break;
case 325:
-#line 2957 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2957 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -5870,11 +5874,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5874 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5878 "cmDependsJavaParser.cxx"
break;
case 326:
-#line 2967 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2967 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -5882,11 +5886,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5886 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5890 "cmDependsJavaParser.cxx"
break;
case 327:
-#line 2976 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2976 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -5894,11 +5898,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5898 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5902 "cmDependsJavaParser.cxx"
break;
case 328:
-#line 2986 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2986 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -5906,11 +5910,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5910 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5914 "cmDependsJavaParser.cxx"
break;
case 329:
-#line 2995 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 2995 "cmDependsJavaParser.y"
{
jpElementStart(5);
jpCheckEmpty(5);
@@ -5918,11 +5922,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5922 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5926 "cmDependsJavaParser.cxx"
break;
case 330:
-#line 3005 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 3005 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -5930,11 +5934,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5934 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5938 "cmDependsJavaParser.cxx"
break;
case 331:
-#line 3014 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 3014 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -5942,11 +5946,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5946 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5950 "cmDependsJavaParser.cxx"
break;
case 332:
-#line 3024 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 3024 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpCheckEmpty(3);
@@ -5954,11 +5958,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5958 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5962 "cmDependsJavaParser.cxx"
break;
case 333:
-#line 3034 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 3034 "cmDependsJavaParser.y"
{
jpElementStart(1);
yyGetParser->DeallocateParserType(&((yyvsp[0].str)));
@@ -5967,11 +5971,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5971 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5975 "cmDependsJavaParser.cxx"
break;
case 334:
-#line 3044 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 3044 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -5979,11 +5983,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5983 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5987 "cmDependsJavaParser.cxx"
break;
case 335:
-#line 3053 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 3053 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -5991,11 +5995,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 5995 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 5999 "cmDependsJavaParser.cxx"
break;
case 336:
-#line 3063 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 3063 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -6003,11 +6007,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 6007 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 6011 "cmDependsJavaParser.cxx"
break;
case 337:
-#line 3072 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 3072 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -6015,11 +6019,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 6019 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 6023 "cmDependsJavaParser.cxx"
break;
case 338:
-#line 3081 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 3081 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -6027,11 +6031,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 6031 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 6035 "cmDependsJavaParser.cxx"
break;
case 339:
-#line 3090 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 3090 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -6039,11 +6043,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 6043 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 6047 "cmDependsJavaParser.cxx"
break;
case 340:
-#line 3099 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 3099 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -6051,11 +6055,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 6055 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 6059 "cmDependsJavaParser.cxx"
break;
case 341:
-#line 3108 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 3108 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -6063,11 +6067,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 6067 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 6071 "cmDependsJavaParser.cxx"
break;
case 342:
-#line 3117 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 3117 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -6075,11 +6079,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 6079 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 6083 "cmDependsJavaParser.cxx"
break;
case 343:
-#line 3126 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 3126 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -6087,11 +6091,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 6091 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 6095 "cmDependsJavaParser.cxx"
break;
case 344:
-#line 3135 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 3135 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -6099,11 +6103,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 6103 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 6107 "cmDependsJavaParser.cxx"
break;
case 345:
-#line 3144 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 3144 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -6111,11 +6115,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 6115 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 6119 "cmDependsJavaParser.cxx"
break;
case 346:
-#line 3153 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 3153 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -6123,11 +6127,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 6127 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 6131 "cmDependsJavaParser.cxx"
break;
case 347:
-#line 3162 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 3162 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -6135,11 +6139,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 6139 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 6143 "cmDependsJavaParser.cxx"
break;
case 348:
-#line 3172 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 3172 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -6147,11 +6151,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 6151 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 6155 "cmDependsJavaParser.cxx"
break;
case 349:
-#line 3182 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 3182 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -6159,11 +6163,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 6163 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 6167 "cmDependsJavaParser.cxx"
break;
case 350:
-#line 3192 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 3192 "cmDependsJavaParser.y"
{
jpElementStart(1);
jpCheckEmpty(1);
@@ -6171,11 +6175,11 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 6175 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 6179 "cmDependsJavaParser.cxx"
break;
case 351:
-#line 3201 "cmDependsJavaParser.y" /* yacc.c:1652 */
+#line 3201 "cmDependsJavaParser.y"
{
jpElementStart(3);
jpStoreClass((yyvsp[-2].str));
@@ -6184,11 +6188,12 @@ yyreduce:
yyGetParser->SetCurrentCombine("");
}
-#line 6188 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 6192 "cmDependsJavaParser.cxx"
break;
-#line 6192 "cmDependsJavaParser.cxx" /* yacc.c:1652 */
+#line 6196 "cmDependsJavaParser.cxx"
+
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
@@ -6421,7 +6426,7 @@ yyreturn:
#endif
return yyresult;
}
-#line 3210 "cmDependsJavaParser.y" /* yacc.c:1918 */
+#line 3210 "cmDependsJavaParser.y"
/* End of grammar */
diff --git a/Source/LexerParser/cmDependsJavaParserTokens.h b/Source/LexerParser/cmDependsJavaParserTokens.h
index 6bbc0848d4..e0dfa01cc5 100644
--- a/Source/LexerParser/cmDependsJavaParserTokens.h
+++ b/Source/LexerParser/cmDependsJavaParserTokens.h
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.3.2. */
+/* A Bison parser, made by GNU Bison 3.4.2. */
/* Bison interface for Yacc-like parsers in C
diff --git a/Source/LexerParser/cmExprParser.cxx b/Source/LexerParser/cmExprParser.cxx
index 8416e7249c..562b35bf71 100644
--- a/Source/LexerParser/cmExprParser.cxx
+++ b/Source/LexerParser/cmExprParser.cxx
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.3.2. */
+/* A Bison parser, made by GNU Bison 3.4.2. */
/* Bison implementation for Yacc-like parsers in C
@@ -48,7 +48,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "3.3.2"
+#define YYBISON_VERSION "3.4.2"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -72,7 +72,7 @@
/* First part of user prologue. */
-#line 1 "cmExprParser.y" /* yacc.c:337 */
+#line 1 "cmExprParser.y"
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
@@ -116,7 +116,8 @@ static void cmExpr_yyerror(yyscan_t yyscanner, const char* message);
# pragma GCC diagnostic ignored "-Wconversion"
#endif
-#line 120 "cmExprParser.cxx" /* yacc.c:337 */
+#line 120 "cmExprParser.cxx"
+
# ifndef YY_NULLPTR
# if defined __cplusplus
# if 201103L <= __cplusplus
@@ -137,8 +138,8 @@ static void cmExpr_yyerror(yyscan_t yyscanner, const char* message);
# define YYERROR_VERBOSE 1
#endif
-/* In a future release of Bison, this section will be replaced
- by #include "cmExprParserTokens.h". */
+/* Use api.header.include to #include this header
+ instead of duplicating it here. */
#ifndef YY_CMEXPR_YY_CMEXPRPARSERTOKENS_H_INCLUDED
# define YY_CMEXPR_YY_CMEXPRPARSERTOKENS_H_INCLUDED
/* Debug traces. */
@@ -296,6 +297,8 @@ typedef short yytype_int16;
#endif
+#define YY_ASSERT(E) ((void) (0 && (E)))
+
#if ! defined yyoverflow || YYERROR_VERBOSE
/* The parser invokes alloca or malloc; define the necessary symbols. */
@@ -688,7 +691,9 @@ yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep, yy
if (yytype < YYNTOKENS)
YYPRINT (yyo, yytoknum[yytype], *yyvaluep);
# endif
+ YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
YYUSE (yytype);
+ YY_IGNORE_MAYBE_UNINITIALIZED_END
}
@@ -1126,6 +1131,8 @@ yynewstate:
| yynewstate -- 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;
if (yyss + yystacksize - 1 <= yyssp)
@@ -1188,8 +1195,6 @@ yysetstate:
}
#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
- YYDPRINTF ((stderr, "Entering state %d\n", yystate));
-
if (yystate == YYFINAL)
YYACCEPT;
@@ -1257,7 +1262,6 @@ yybackup:
YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
*++yyvsp = yylval;
YY_IGNORE_MAYBE_UNINITIALIZED_END
-
goto yynewstate;
@@ -1292,195 +1296,196 @@ yyreduce:
YY_REDUCE_PRINT (yyn);
switch (yyn)
{
- case 2:
-#line 77 "cmExprParser.y" /* yacc.c:1652 */
+ case 2:
+#line 77 "cmExprParser.y"
{
cmExpr_yyget_extra(yyscanner)->SetResult((yyvsp[0].Number));
}
-#line 1301 "cmExprParser.cxx" /* yacc.c:1652 */
+#line 1305 "cmExprParser.cxx"
break;
case 3:
-#line 82 "cmExprParser.y" /* yacc.c:1652 */
+#line 82 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[0].Number);
}
-#line 1309 "cmExprParser.cxx" /* yacc.c:1652 */
+#line 1313 "cmExprParser.cxx"
break;
case 4:
-#line 85 "cmExprParser.y" /* yacc.c:1652 */
+#line 85 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[-2].Number) | (yyvsp[0].Number);
}
-#line 1317 "cmExprParser.cxx" /* yacc.c:1652 */
+#line 1321 "cmExprParser.cxx"
break;
case 5:
-#line 90 "cmExprParser.y" /* yacc.c:1652 */
+#line 90 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[0].Number);
}
-#line 1325 "cmExprParser.cxx" /* yacc.c:1652 */
+#line 1329 "cmExprParser.cxx"
break;
case 6:
-#line 93 "cmExprParser.y" /* yacc.c:1652 */
+#line 93 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[-2].Number) ^ (yyvsp[0].Number);
}
-#line 1333 "cmExprParser.cxx" /* yacc.c:1652 */
+#line 1337 "cmExprParser.cxx"
break;
case 7:
-#line 98 "cmExprParser.y" /* yacc.c:1652 */
+#line 98 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[0].Number);
}
-#line 1341 "cmExprParser.cxx" /* yacc.c:1652 */
+#line 1345 "cmExprParser.cxx"
break;
case 8:
-#line 101 "cmExprParser.y" /* yacc.c:1652 */
+#line 101 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[-2].Number) & (yyvsp[0].Number);
}
-#line 1349 "cmExprParser.cxx" /* yacc.c:1652 */
+#line 1353 "cmExprParser.cxx"
break;
case 9:
-#line 106 "cmExprParser.y" /* yacc.c:1652 */
+#line 106 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[0].Number);
}
-#line 1357 "cmExprParser.cxx" /* yacc.c:1652 */
+#line 1361 "cmExprParser.cxx"
break;
case 10:
-#line 109 "cmExprParser.y" /* yacc.c:1652 */
+#line 109 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[-2].Number) << (yyvsp[0].Number);
}
-#line 1365 "cmExprParser.cxx" /* yacc.c:1652 */
+#line 1369 "cmExprParser.cxx"
break;
case 11:
-#line 112 "cmExprParser.y" /* yacc.c:1652 */
+#line 112 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[-2].Number) >> (yyvsp[0].Number);
}
-#line 1373 "cmExprParser.cxx" /* yacc.c:1652 */
+#line 1377 "cmExprParser.cxx"
break;
case 12:
-#line 117 "cmExprParser.y" /* yacc.c:1652 */
+#line 117 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[0].Number);
}
-#line 1381 "cmExprParser.cxx" /* yacc.c:1652 */
+#line 1385 "cmExprParser.cxx"
break;
case 13:
-#line 120 "cmExprParser.y" /* yacc.c:1652 */
+#line 120 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[-2].Number) + (yyvsp[0].Number);
}
-#line 1389 "cmExprParser.cxx" /* yacc.c:1652 */
+#line 1393 "cmExprParser.cxx"
break;
case 14:
-#line 123 "cmExprParser.y" /* yacc.c:1652 */
+#line 123 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[-2].Number) - (yyvsp[0].Number);
}
-#line 1397 "cmExprParser.cxx" /* yacc.c:1652 */
+#line 1401 "cmExprParser.cxx"
break;
case 15:
-#line 128 "cmExprParser.y" /* yacc.c:1652 */
+#line 128 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[0].Number);
}
-#line 1405 "cmExprParser.cxx" /* yacc.c:1652 */
+#line 1409 "cmExprParser.cxx"
break;
case 16:
-#line 131 "cmExprParser.y" /* yacc.c:1652 */
+#line 131 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[-2].Number) * (yyvsp[0].Number);
}
-#line 1413 "cmExprParser.cxx" /* yacc.c:1652 */
+#line 1417 "cmExprParser.cxx"
break;
case 17:
-#line 134 "cmExprParser.y" /* yacc.c:1652 */
+#line 134 "cmExprParser.y"
{
if (yyvsp[0].Number == 0) {
throw std::overflow_error("divide by zero");
}
(yyval.Number) = (yyvsp[-2].Number) / (yyvsp[0].Number);
}
-#line 1424 "cmExprParser.cxx" /* yacc.c:1652 */
+#line 1428 "cmExprParser.cxx"
break;
case 18:
-#line 140 "cmExprParser.y" /* yacc.c:1652 */
+#line 140 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[-2].Number) % (yyvsp[0].Number);
}
-#line 1432 "cmExprParser.cxx" /* yacc.c:1652 */
+#line 1436 "cmExprParser.cxx"
break;
case 19:
-#line 145 "cmExprParser.y" /* yacc.c:1652 */
+#line 145 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[0].Number);
}
-#line 1440 "cmExprParser.cxx" /* yacc.c:1652 */
+#line 1444 "cmExprParser.cxx"
break;
case 20:
-#line 148 "cmExprParser.y" /* yacc.c:1652 */
+#line 148 "cmExprParser.y"
{
(yyval.Number) = + (yyvsp[0].Number);
}
-#line 1448 "cmExprParser.cxx" /* yacc.c:1652 */
+#line 1452 "cmExprParser.cxx"
break;
case 21:
-#line 151 "cmExprParser.y" /* yacc.c:1652 */
+#line 151 "cmExprParser.y"
{
(yyval.Number) = - (yyvsp[0].Number);
}
-#line 1456 "cmExprParser.cxx" /* yacc.c:1652 */
+#line 1460 "cmExprParser.cxx"
break;
case 22:
-#line 154 "cmExprParser.y" /* yacc.c:1652 */
+#line 154 "cmExprParser.y"
{
(yyval.Number) = ~ (yyvsp[0].Number);
}
-#line 1464 "cmExprParser.cxx" /* yacc.c:1652 */
+#line 1468 "cmExprParser.cxx"
break;
case 23:
-#line 159 "cmExprParser.y" /* yacc.c:1652 */
+#line 159 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[0].Number);
}
-#line 1472 "cmExprParser.cxx" /* yacc.c:1652 */
+#line 1476 "cmExprParser.cxx"
break;
case 24:
-#line 162 "cmExprParser.y" /* yacc.c:1652 */
+#line 162 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[-1].Number);
}
-#line 1480 "cmExprParser.cxx" /* yacc.c:1652 */
+#line 1484 "cmExprParser.cxx"
break;
-#line 1484 "cmExprParser.cxx" /* yacc.c:1652 */
+#line 1488 "cmExprParser.cxx"
+
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
@@ -1713,7 +1718,7 @@ yyreturn:
#endif
return yyresult;
}
-#line 167 "cmExprParser.y" /* yacc.c:1918 */
+#line 167 "cmExprParser.y"
/* End of grammar */
diff --git a/Source/LexerParser/cmExprParserTokens.h b/Source/LexerParser/cmExprParserTokens.h
index 5ffd7c5100..e30a832572 100644
--- a/Source/LexerParser/cmExprParserTokens.h
+++ b/Source/LexerParser/cmExprParserTokens.h
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.3.2. */
+/* A Bison parser, made by GNU Bison 3.4.2. */
/* Bison interface for Yacc-like parsers in C
diff --git a/Source/LexerParser/cmFortranParser.cxx b/Source/LexerParser/cmFortranParser.cxx
index 2ca79276d8..f016fd8b6f 100644
--- a/Source/LexerParser/cmFortranParser.cxx
+++ b/Source/LexerParser/cmFortranParser.cxx
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.3.2. */
+/* A Bison parser, made by GNU Bison 3.4.2. */
/* Bison implementation for Yacc-like parsers in C
@@ -48,7 +48,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "3.3.2"
+#define YYBISON_VERSION "3.4.2"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -72,7 +72,7 @@
/* First part of user prologue. */
-#line 1 "cmFortranParser.y" /* yacc.c:337 */
+#line 1 "cmFortranParser.y"
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
@@ -135,7 +135,8 @@ static void cmFortran_yyerror(yyscan_t yyscanner, const char* message)
# pragma GCC diagnostic ignored "-Wconversion"
#endif
-#line 139 "cmFortranParser.cxx" /* yacc.c:337 */
+#line 139 "cmFortranParser.cxx"
+
# ifndef YY_NULLPTR
# if defined __cplusplus
# if 201103L <= __cplusplus
@@ -156,8 +157,8 @@ static void cmFortran_yyerror(yyscan_t yyscanner, const char* message)
# define YYERROR_VERBOSE 1
#endif
-/* In a future release of Bison, this section will be replaced
- by #include "cmFortranParserTokens.h". */
+/* Use api.header.include to #include this header
+ instead of duplicating it here. */
#ifndef YY_CMFORTRAN_YY_CMFORTRANPARSERTOKENS_H_INCLUDED
# define YY_CMFORTRAN_YY_CMFORTRANPARSERTOKENS_H_INCLUDED
/* Debug traces. */
@@ -255,16 +256,15 @@ extern int cmFortran_yydebug;
/* Value type. */
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-
union YYSTYPE
{
-#line 73 "cmFortranParser.y" /* yacc.c:352 */
+#line 73 "cmFortranParser.y"
char* string;
-#line 266 "cmFortranParser.cxx" /* yacc.c:352 */
-};
+#line 266 "cmFortranParser.cxx"
+};
typedef union YYSTYPE YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define YYSTYPE_IS_DECLARED 1
@@ -378,6 +378,8 @@ typedef short yytype_int16;
#endif
+#define YY_ASSERT(E) ((void) (0 && (E)))
+
#if ! defined yyoverflow || YYERROR_VERBOSE
/* The parser invokes alloca or malloc; define the necessary symbols. */
@@ -930,7 +932,9 @@ yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep, yy
if (yytype < YYNTOKENS)
YYPRINT (yyo, yytoknum[yytype], *yyvaluep);
# endif
+ YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
YYUSE (yytype);
+ YY_IGNORE_MAYBE_UNINITIALIZED_END
}
@@ -1368,6 +1372,8 @@ yynewstate:
| yynewstate -- 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;
if (yyss + yystacksize - 1 <= yyssp)
@@ -1430,8 +1436,6 @@ yysetstate:
}
#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
- YYDPRINTF ((stderr, "Entering state %d\n", yystate));
-
if (yystate == YYFINAL)
YYACCEPT;
@@ -1499,7 +1503,6 @@ yybackup:
YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
*++yyvsp = yylval;
YY_IGNORE_MAYBE_UNINITIALIZED_END
-
goto yynewstate;
@@ -1534,27 +1537,27 @@ yyreduce:
YY_REDUCE_PRINT (yyn);
switch (yyn)
{
- case 4:
-#line 104 "cmFortranParser.y" /* yacc.c:1652 */
+ case 4:
+#line 104 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_SetInInterface(parser, true);
}
-#line 1544 "cmFortranParser.cxx" /* yacc.c:1652 */
+#line 1547 "cmFortranParser.cxx"
break;
case 5:
-#line 108 "cmFortranParser.y" /* yacc.c:1652 */
+#line 108 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleUse(parser, (yyvsp[-2].string));
free((yyvsp[-2].string));
}
-#line 1554 "cmFortranParser.cxx" /* yacc.c:1652 */
+#line 1557 "cmFortranParser.cxx"
break;
case 6:
-#line 113 "cmFortranParser.y" /* yacc.c:1652 */
+#line 113 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
if (cmsysString_strcasecmp((yyvsp[-2].string), "function") != 0 &&
@@ -1564,22 +1567,22 @@ yyreduce:
}
free((yyvsp[-2].string));
}
-#line 1568 "cmFortranParser.cxx" /* yacc.c:1652 */
+#line 1571 "cmFortranParser.cxx"
break;
case 7:
-#line 122 "cmFortranParser.y" /* yacc.c:1652 */
+#line 122 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleSubmodule(parser, (yyvsp[-4].string), (yyvsp[-2].string));
free((yyvsp[-4].string));
free((yyvsp[-2].string));
}
-#line 1579 "cmFortranParser.cxx" /* yacc.c:1652 */
+#line 1582 "cmFortranParser.cxx"
break;
case 8:
-#line 128 "cmFortranParser.y" /* yacc.c:1652 */
+#line 128 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleSubmoduleNested(parser, (yyvsp[-6].string), (yyvsp[-4].string), (yyvsp[-2].string));
@@ -1587,40 +1590,40 @@ yyreduce:
free((yyvsp[-4].string));
free((yyvsp[-2].string));
}
-#line 1591 "cmFortranParser.cxx" /* yacc.c:1652 */
+#line 1594 "cmFortranParser.cxx"
break;
case 9:
-#line 135 "cmFortranParser.y" /* yacc.c:1652 */
+#line 135 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_SetInInterface(parser, true);
free((yyvsp[-2].string));
}
-#line 1601 "cmFortranParser.cxx" /* yacc.c:1652 */
+#line 1604 "cmFortranParser.cxx"
break;
case 10:
-#line 140 "cmFortranParser.y" /* yacc.c:1652 */
+#line 140 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_SetInInterface(parser, false);
}
-#line 1610 "cmFortranParser.cxx" /* yacc.c:1652 */
+#line 1613 "cmFortranParser.cxx"
break;
case 11:
-#line 144 "cmFortranParser.y" /* yacc.c:1652 */
+#line 144 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleUse(parser, (yyvsp[-2].string));
free((yyvsp[-2].string));
}
-#line 1620 "cmFortranParser.cxx" /* yacc.c:1652 */
+#line 1623 "cmFortranParser.cxx"
break;
case 12:
-#line 149 "cmFortranParser.y" /* yacc.c:1652 */
+#line 149 "cmFortranParser.y"
{
if (cmsysString_strcasecmp((yyvsp[-4].string), "non_intrinsic") == 0) {
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
@@ -1629,139 +1632,140 @@ yyreduce:
free((yyvsp[-4].string));
free((yyvsp[-2].string));
}
-#line 1633 "cmFortranParser.cxx" /* yacc.c:1652 */
+#line 1636 "cmFortranParser.cxx"
break;
case 13:
-#line 157 "cmFortranParser.y" /* yacc.c:1652 */
+#line 157 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleInclude(parser, (yyvsp[-2].string));
free((yyvsp[-2].string));
}
-#line 1643 "cmFortranParser.cxx" /* yacc.c:1652 */
+#line 1646 "cmFortranParser.cxx"
break;
case 14:
-#line 162 "cmFortranParser.y" /* yacc.c:1652 */
+#line 162 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleLineDirective(parser, (yyvsp[-2].string));
free((yyvsp[-2].string));
}
-#line 1653 "cmFortranParser.cxx" /* yacc.c:1652 */
+#line 1656 "cmFortranParser.cxx"
break;
case 15:
-#line 167 "cmFortranParser.y" /* yacc.c:1652 */
+#line 167 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleInclude(parser, (yyvsp[-2].string));
free((yyvsp[-2].string));
}
-#line 1663 "cmFortranParser.cxx" /* yacc.c:1652 */
+#line 1666 "cmFortranParser.cxx"
break;
case 16:
-#line 172 "cmFortranParser.y" /* yacc.c:1652 */
+#line 172 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleInclude(parser, (yyvsp[-2].string));
free((yyvsp[-2].string));
}
-#line 1673 "cmFortranParser.cxx" /* yacc.c:1652 */
+#line 1676 "cmFortranParser.cxx"
break;
case 17:
-#line 177 "cmFortranParser.y" /* yacc.c:1652 */
+#line 177 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleDefine(parser, (yyvsp[-2].string));
free((yyvsp[-2].string));
}
-#line 1683 "cmFortranParser.cxx" /* yacc.c:1652 */
+#line 1686 "cmFortranParser.cxx"
break;
case 18:
-#line 182 "cmFortranParser.y" /* yacc.c:1652 */
+#line 182 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleUndef(parser, (yyvsp[-2].string));
free((yyvsp[-2].string));
}
-#line 1693 "cmFortranParser.cxx" /* yacc.c:1652 */
+#line 1696 "cmFortranParser.cxx"
break;
case 19:
-#line 187 "cmFortranParser.y" /* yacc.c:1652 */
+#line 187 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleIfdef(parser, (yyvsp[-2].string));
free((yyvsp[-2].string));
}
-#line 1703 "cmFortranParser.cxx" /* yacc.c:1652 */
+#line 1706 "cmFortranParser.cxx"
break;
case 20:
-#line 192 "cmFortranParser.y" /* yacc.c:1652 */
+#line 192 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleIfndef(parser, (yyvsp[-2].string));
free((yyvsp[-2].string));
}
-#line 1713 "cmFortranParser.cxx" /* yacc.c:1652 */
+#line 1716 "cmFortranParser.cxx"
break;
case 21:
-#line 197 "cmFortranParser.y" /* yacc.c:1652 */
+#line 197 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleIf(parser);
}
-#line 1722 "cmFortranParser.cxx" /* yacc.c:1652 */
+#line 1725 "cmFortranParser.cxx"
break;
case 22:
-#line 201 "cmFortranParser.y" /* yacc.c:1652 */
+#line 201 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleElif(parser);
}
-#line 1731 "cmFortranParser.cxx" /* yacc.c:1652 */
+#line 1734 "cmFortranParser.cxx"
break;
case 23:
-#line 205 "cmFortranParser.y" /* yacc.c:1652 */
+#line 205 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleElse(parser);
}
-#line 1740 "cmFortranParser.cxx" /* yacc.c:1652 */
+#line 1743 "cmFortranParser.cxx"
break;
case 24:
-#line 209 "cmFortranParser.y" /* yacc.c:1652 */
+#line 209 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleEndif(parser);
}
-#line 1749 "cmFortranParser.cxx" /* yacc.c:1652 */
+#line 1752 "cmFortranParser.cxx"
break;
case 48:
-#line 231 "cmFortranParser.y" /* yacc.c:1652 */
+#line 231 "cmFortranParser.y"
{ free ((yyvsp[0].string)); }
-#line 1755 "cmFortranParser.cxx" /* yacc.c:1652 */
+#line 1758 "cmFortranParser.cxx"
break;
case 55:
-#line 238 "cmFortranParser.y" /* yacc.c:1652 */
+#line 238 "cmFortranParser.y"
{ free ((yyvsp[0].string)); }
-#line 1761 "cmFortranParser.cxx" /* yacc.c:1652 */
+#line 1764 "cmFortranParser.cxx"
break;
-#line 1765 "cmFortranParser.cxx" /* yacc.c:1652 */
+#line 1768 "cmFortranParser.cxx"
+
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
@@ -1994,6 +1998,6 @@ yyreturn:
#endif
return yyresult;
}
-#line 249 "cmFortranParser.y" /* yacc.c:1918 */
+#line 249 "cmFortranParser.y"
/* End of grammar */
diff --git a/Source/LexerParser/cmFortranParserTokens.h b/Source/LexerParser/cmFortranParserTokens.h
index 0da4c1c43e..f66a15cf87 100644
--- a/Source/LexerParser/cmFortranParserTokens.h
+++ b/Source/LexerParser/cmFortranParserTokens.h
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.3.2. */
+/* A Bison parser, made by GNU Bison 3.4.2. */
/* Bison interface for Yacc-like parsers in C
@@ -131,16 +131,15 @@ extern int cmFortran_yydebug;
/* Value type. */
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-
union YYSTYPE
{
-#line 73 "cmFortranParser.y" /* yacc.c:1921 */
+#line 73 "cmFortranParser.y"
char* string;
-#line 142 "cmFortranParserTokens.h" /* yacc.c:1921 */
-};
+#line 141 "cmFortranParserTokens.h"
+};
typedef union YYSTYPE YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define YYSTYPE_IS_DECLARED 1
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=28994115e83b568ccba546db26a55381cbad244d
commit 28994115e83b568ccba546db26a55381cbad244d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 7 11:27:48 2019 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 7 14:21:18 2019 -0500
ctest_test: Add option to REPEAT tests
diff --git a/Help/command/ctest_test.rst b/Help/command/ctest_test.rst
index 7a3393b4d4..5c67b2c706 100644
--- a/Help/command/ctest_test.rst
+++ b/Help/command/ctest_test.rst
@@ -23,6 +23,7 @@ Perform the :ref:`CTest Test Step` as a :ref:`Dashboard Client`.
[STOP_TIME <time-of-day>]
[RETURN_VALUE <result-var>]
[CAPTURE_CMAKE_ERROR <result-var>]
+ [REPEAT <mode>:<n>]
[QUIET]
)
@@ -95,6 +96,25 @@ The options are:
and then the ``--test-load`` command-line argument to :manual:`ctest(1)`.
See also the ``TestLoad`` setting in the :ref:`CTest Test Step`.
+``REPEAT <mode>:<n>``
+ Run tests repeatedly based on the given ``<mode>`` up to ``<n>`` times.
+ The modes are:
+
+ ``UNTIL_FAIL``
+ Require each test to run ``<n>`` times without failing in order to pass.
+ This is useful in finding sporadic failures in test cases.
+
+ ``UNTIL_PASS``
+ Allow each test to run up to ``<n>`` times in order to pass.
+ Repeats tests if they fail for any reason.
+ This is useful in tolerating sporadic failures in test cases.
+
+ ``AFTER_TIMEOUT``
+ Allow each test to run up to ``<n>`` times in order to pass.
+ Repeats tests only if they timeout.
+ This is useful in tolerating sporadic timeouts in test cases
+ on busy machines.
+
``SCHEDULE_RANDOM <ON|OFF>``
Launch tests in a random order. This may be useful for detecting
implicit test dependencies.
diff --git a/Help/release/dev/ctest-repeat-until-pass.rst b/Help/release/dev/ctest-repeat-until-pass.rst
index d177247181..b5f6c26281 100644
--- a/Help/release/dev/ctest-repeat-until-pass.rst
+++ b/Help/release/dev/ctest-repeat-until-pass.rst
@@ -4,3 +4,6 @@ ctest-repeat-until-pass
* The :manual:`ctest(1)` tool learned new ``--repeat-until-pass <n>``
and ``--repeat-after-timeout <n>`` options to help tolerate sporadic
test failures.
+
+* The :command:`ctest_test` command gained a ``REPEAT <mode>:<n>`` option
+ to specify conditions in which to repeat tests.
diff --git a/Source/CTest/cmCTestTestCommand.cxx b/Source/CTest/cmCTestTestCommand.cxx
index 9784214053..0f9b6958df 100644
--- a/Source/CTest/cmCTestTestCommand.cxx
+++ b/Source/CTest/cmCTestTestCommand.cxx
@@ -29,6 +29,7 @@ void cmCTestTestCommand::BindArguments()
this->Bind("EXCLUDE_FIXTURE_SETUP"_s, this->ExcludeFixtureSetup);
this->Bind("EXCLUDE_FIXTURE_CLEANUP"_s, this->ExcludeFixtureCleanup);
this->Bind("PARALLEL_LEVEL"_s, this->ParallelLevel);
+ this->Bind("REPEAT"_s, this->Repeat);
this->Bind("SCHEDULE_RANDOM"_s, this->ScheduleRandom);
this->Bind("STOP_TIME"_s, this->StopTime);
this->Bind("TEST_LOAD"_s, this->TestLoad);
@@ -85,6 +86,9 @@ cmCTestGenericHandler* cmCTestTestCommand::InitializeHandler()
if (!this->ParallelLevel.empty()) {
handler->SetOption("ParallelLevel", this->ParallelLevel.c_str());
}
+ if (!this->Repeat.empty()) {
+ handler->SetOption("Repeat", this->Repeat.c_str());
+ }
if (!this->ScheduleRandom.empty()) {
handler->SetOption("ScheduleRandom", this->ScheduleRandom.c_str());
}
diff --git a/Source/CTest/cmCTestTestCommand.h b/Source/CTest/cmCTestTestCommand.h
index 4019694b2e..2345afbcfe 100644
--- a/Source/CTest/cmCTestTestCommand.h
+++ b/Source/CTest/cmCTestTestCommand.h
@@ -55,6 +55,7 @@ protected:
std::string ExcludeFixtureSetup;
std::string ExcludeFixtureCleanup;
std::string ParallelLevel;
+ std::string Repeat;
std::string ScheduleRandom;
std::string StopTime;
std::string TestLoad;
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index 9a060831b3..37c71547cc 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -471,6 +471,30 @@ bool cmCTestTestHandler::ProcessOptions()
if (cmIsOn(this->GetOption("ScheduleRandom"))) {
this->CTest->SetScheduleType("Random");
}
+ if (const char* repeat = this->GetOption("Repeat")) {
+ cmsys::RegularExpression repeatRegex(
+ "^(UNTIL_FAIL|UNTIL_PASS|AFTER_TIMEOUT):([0-9]+)$");
+ if (repeatRegex.find(repeat)) {
+ std::string const& count = repeatRegex.match(2);
+ unsigned long n = 1;
+ cmStrToULong(count, &n); // regex guarantees success
+ this->RepeatCount = static_cast<int>(n);
+ if (this->RepeatCount > 1) {
+ std::string const& mode = repeatRegex.match(1);
+ if (mode == "UNTIL_FAIL") {
+ this->RepeatMode = cmCTest::Repeat::UntilFail;
+ } else if (mode == "UNTIL_PASS") {
+ this->RepeatMode = cmCTest::Repeat::UntilPass;
+ } else if (mode == "AFTER_TIMEOUT") {
+ this->RepeatMode = cmCTest::Repeat::AfterTimeout;
+ }
+ }
+ } else {
+ cmCTestLog(this->CTest, ERROR_MESSAGE,
+ "Repeat option invalid value: " << repeat << std::endl);
+ return false;
+ }
+ }
if (this->GetOption("ParallelLevel")) {
this->CTest->SetParallelLevel(atoi(this->GetOption("ParallelLevel")));
}
@@ -1231,8 +1255,12 @@ void cmCTestTestHandler::ProcessDirectory(std::vector<std::string>& passed,
parallel->SetCTest(this->CTest);
parallel->SetParallelLevel(this->CTest->GetParallelLevel());
parallel->SetTestHandler(this);
- parallel->SetRepeatMode(this->CTest->GetRepeatMode(),
- this->CTest->GetRepeatCount());
+ if (this->RepeatMode != cmCTest::Repeat::Never) {
+ parallel->SetRepeatMode(this->RepeatMode, this->RepeatCount);
+ } else {
+ parallel->SetRepeatMode(this->CTest->GetRepeatMode(),
+ this->CTest->GetRepeatCount());
+ }
parallel->SetQuiet(this->Quiet);
if (this->TestLoad > 0) {
parallel->SetTestLoad(this->TestLoad);
diff --git a/Source/CTest/cmCTestTestHandler.h b/Source/CTest/cmCTestTestHandler.h
index eab75d0eb8..55237f9b3a 100644
--- a/Source/CTest/cmCTestTestHandler.h
+++ b/Source/CTest/cmCTestTestHandler.h
@@ -18,12 +18,12 @@
#include "cmsys/RegularExpression.hxx"
+#include "cmCTest.h"
#include "cmCTestGenericHandler.h"
#include "cmCTestResourceSpec.h"
#include "cmDuration.h"
#include "cmListFileCache.h"
-class cmCTest;
class cmMakefile;
class cmXMLWriter;
@@ -353,6 +353,8 @@ private:
std::ostream* LogFile;
+ cmCTest::Repeat RepeatMode = cmCTest::Repeat::Never;
+ int RepeatCount = 1;
bool RerunFailed;
};
diff --git a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
index 6877e6a87c..84d1d666cb 100644
--- a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
@@ -1,6 +1,9 @@
include(RunCTest)
set(RunCMake_TEST_TIMEOUT 60)
+unset(ENV{CTEST_PARALLEL_LEVEL})
+unset(ENV{CTEST_OUTPUT_ON_FAILURE})
+
set(CASE_CTEST_TEST_ARGS "")
set(CASE_CTEST_TEST_LOAD "")
@@ -71,7 +74,24 @@ add_test(NAME PassingTest COMMAND ${CMAKE_COMMAND} -E echo PassingTestOutput)
add_test(NAME FailingTest COMMAND ${CMAKE_COMMAND} -E no_such_command)
]])
- unset(ENV{CTEST_PARALLEL_LEVEL})
run_ctest(TestOutputSize)
endfunction()
run_TestOutputSize()
+
+run_ctest_test(TestRepeatBad1 REPEAT UNKNOWN:3)
+run_ctest_test(TestRepeatBad2 REPEAT UNTIL_FAIL:-1)
+
+function(run_TestRepeat case)
+ set(CASE_CTEST_TEST_ARGS EXCLUDE RunCMakeVersion ${ARGN})
+ string(CONCAT CASE_CMAKELISTS_SUFFIX_CODE [[
+add_test(NAME testRepeat
+ COMMAND ${CMAKE_COMMAND} -D COUNT_FILE=${CMAKE_CURRENT_BINARY_DIR}/count.cmake
+ -P "]] "${RunCMake_SOURCE_DIR}/TestRepeat${case}" [[.cmake")
+set_property(TEST testRepeat PROPERTY TIMEOUT 5)
+ ]])
+
+ run_ctest(TestRepeat${case})
+endfunction()
+run_TestRepeat(UntilFail REPEAT UNTIL_FAIL:3)
+run_TestRepeat(UntilPass REPEAT UNTIL_PASS:3)
+run_TestRepeat(AfterTimeout REPEAT AFTER_TIMEOUT:3)
diff --git a/Tests/RunCMake/ctest_test/TestRepeatAfterTimeout-stdout.txt b/Tests/RunCMake/ctest_test/TestRepeatAfterTimeout-stdout.txt
new file mode 100644
index 0000000000..17657c5509
--- /dev/null
+++ b/Tests/RunCMake/ctest_test/TestRepeatAfterTimeout-stdout.txt
@@ -0,0 +1,10 @@
+Test project [^
+]*/Tests/RunCMake/ctest_test/TestRepeatAfterTimeout-build
+ Start 1: testRepeat
+1/1 Test #1: testRepeat .......................\*\*\*Timeout +[0-9.]+ sec
+ Start 1: testRepeat
+ Test #1: testRepeat ....................... Passed +[0-9.]+ sec
++
+100% tests passed, 0 tests failed out of 1
++
+Total Test time \(real\) = +[0-9.]+ sec$
diff --git a/Tests/RunCMake/ctest_test/TestRepeatAfterTimeout.cmake b/Tests/RunCMake/ctest_test/TestRepeatAfterTimeout.cmake
new file mode 100644
index 0000000000..abde4f0117
--- /dev/null
+++ b/Tests/RunCMake/ctest_test/TestRepeatAfterTimeout.cmake
@@ -0,0 +1,10 @@
+include("${COUNT_FILE}" OPTIONAL)
+if(NOT COUNT)
+ set(COUNT 0)
+endif()
+math(EXPR COUNT "${COUNT} + 1")
+file(WRITE "${COUNT_FILE}" "set(COUNT ${COUNT})\n")
+if(NOT COUNT EQUAL 2)
+ message("this test times out except on the 2nd run")
+ execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 10)
+endif()
diff --git a/Tests/RunCMake/ctest_test/TestRepeatBad1-result.txt b/Tests/RunCMake/ctest_test/TestRepeatBad1-result.txt
new file mode 100644
index 0000000000..b57e2deb77
--- /dev/null
+++ b/Tests/RunCMake/ctest_test/TestRepeatBad1-result.txt
@@ -0,0 +1 @@
+(-1|255)
diff --git a/Tests/RunCMake/ctest_test/TestRepeatBad1-stderr.txt b/Tests/RunCMake/ctest_test/TestRepeatBad1-stderr.txt
new file mode 100644
index 0000000000..37cffbfe6e
--- /dev/null
+++ b/Tests/RunCMake/ctest_test/TestRepeatBad1-stderr.txt
@@ -0,0 +1 @@
+Repeat option invalid value: UNKNOWN:3
diff --git a/Tests/RunCMake/ctest_test/TestRepeatBad2-result.txt b/Tests/RunCMake/ctest_test/TestRepeatBad2-result.txt
new file mode 100644
index 0000000000..b57e2deb77
--- /dev/null
+++ b/Tests/RunCMake/ctest_test/TestRepeatBad2-result.txt
@@ -0,0 +1 @@
+(-1|255)
diff --git a/Tests/RunCMake/ctest_test/TestRepeatBad2-stderr.txt b/Tests/RunCMake/ctest_test/TestRepeatBad2-stderr.txt
new file mode 100644
index 0000000000..ca5cef754f
--- /dev/null
+++ b/Tests/RunCMake/ctest_test/TestRepeatBad2-stderr.txt
@@ -0,0 +1 @@
+Repeat option invalid value: UNTIL_FAIL:-1
diff --git a/Tests/RunCMake/ctest_test/TestRepeatUntilFail-stdout.txt b/Tests/RunCMake/ctest_test/TestRepeatUntilFail-stdout.txt
new file mode 100644
index 0000000000..5f91a67e4f
--- /dev/null
+++ b/Tests/RunCMake/ctest_test/TestRepeatUntilFail-stdout.txt
@@ -0,0 +1,13 @@
+Test project [^
+]*/Tests/RunCMake/ctest_test/TestRepeatUntilFail-build
+ Start 1: testRepeat
+ Test #1: testRepeat ....................... Passed +[0-9.]+ sec
+ Start 1: testRepeat
+ Test #1: testRepeat .......................\*\*\*Failed +[0-9.]+ sec
++
+0% tests passed, 1 tests failed out of 1
++
+Total Test time \(real\) = +[0-9.]+ sec
++
+The following tests FAILED:
+[ ]+1 - testRepeat \(Failed\)$
diff --git a/Tests/RunCMake/ctest_test/TestRepeatUntilFail.cmake b/Tests/RunCMake/ctest_test/TestRepeatUntilFail.cmake
new file mode 100644
index 0000000000..5eb0d8a9f0
--- /dev/null
+++ b/Tests/RunCMake/ctest_test/TestRepeatUntilFail.cmake
@@ -0,0 +1,9 @@
+include("${COUNT_FILE}" OPTIONAL)
+if(NOT COUNT)
+ set(COUNT 0)
+endif()
+math(EXPR COUNT "${COUNT} + 1")
+file(WRITE "${COUNT_FILE}" "set(COUNT ${COUNT})\n")
+if(COUNT EQUAL 2)
+ message(FATAL_ERROR "this test fails on the 2nd run")
+endif()
diff --git a/Tests/RunCMake/ctest_test/TestRepeatUntilPass-stdout.txt b/Tests/RunCMake/ctest_test/TestRepeatUntilPass-stdout.txt
new file mode 100644
index 0000000000..bc6939aa81
--- /dev/null
+++ b/Tests/RunCMake/ctest_test/TestRepeatUntilPass-stdout.txt
@@ -0,0 +1,10 @@
+Test project [^
+]*/Tests/RunCMake/ctest_test/TestRepeatUntilPass-build
+ Start 1: testRepeat
+1/1 Test #1: testRepeat .......................\*\*\*Failed +[0-9.]+ sec
+ Start 1: testRepeat
+ Test #1: testRepeat ....................... Passed +[0-9.]+ sec
++
+100% tests passed, 0 tests failed out of 1
++
+Total Test time \(real\) = +[0-9.]+ sec$
diff --git a/Tests/RunCMake/ctest_test/TestRepeatUntilPass.cmake b/Tests/RunCMake/ctest_test/TestRepeatUntilPass.cmake
new file mode 100644
index 0000000000..0662522175
--- /dev/null
+++ b/Tests/RunCMake/ctest_test/TestRepeatUntilPass.cmake
@@ -0,0 +1,9 @@
+include("${COUNT_FILE}" OPTIONAL)
+if(NOT COUNT)
+ set(COUNT 0)
+endif()
+math(EXPR COUNT "${COUNT} + 1")
+file(WRITE "${COUNT_FILE}" "set(COUNT ${COUNT})\n")
+if(NOT COUNT EQUAL 2)
+ message(FATAL_ERROR "this test passes only on the 2nd run")
+endif()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=42d5d8f425e655a07d3dcb0802d90cb5c167b164
commit 42d5d8f425e655a07d3dcb0802d90cb5c167b164
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 7 11:10:06 2019 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 7 14:14:36 2019 -0500
cmCTestMultiProcessHandler: Hold repeat mode as a member
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index 992a2ef96d..04abf98195 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -171,9 +171,9 @@ bool cmCTestMultiProcessHandler::StartTestProcess(int test)
this->RunningCount += GetProcessorsUsed(test);
cmCTestRunTest* testRun = new cmCTestRunTest(*this);
- if (this->CTest->GetRepeatMode() != cmCTest::Repeat::Never) {
- testRun->SetRepeatMode(this->CTest->GetRepeatMode());
- testRun->SetNumberOfRuns(this->CTest->GetRepeatCount());
+ if (this->RepeatMode != cmCTest::Repeat::Never) {
+ testRun->SetRepeatMode(this->RepeatMode);
+ testRun->SetNumberOfRuns(this->RepeatCount);
}
testRun->SetIndex(test);
testRun->SetTestProperties(this->Properties[test]);
diff --git a/Source/CTest/cmCTestMultiProcessHandler.h b/Source/CTest/cmCTestMultiProcessHandler.h
index 1db4bfdd1b..483740138e 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.h
+++ b/Source/CTest/cmCTestMultiProcessHandler.h
@@ -14,11 +14,11 @@
#include "cm_uv.h"
+#include "cmCTest.h"
#include "cmCTestResourceAllocator.h"
#include "cmCTestTestHandler.h"
#include "cmUVHandlePtr.h"
-class cmCTest;
struct cmCTestBinPackerAllocation;
class cmCTestResourceSpec;
class cmCTestRunTest;
@@ -85,6 +85,12 @@ public:
cmCTestTestHandler* GetTestHandler() { return this->TestHandler; }
+ void SetRepeatMode(cmCTest::Repeat mode, int count)
+ {
+ this->RepeatMode = mode;
+ this->RepeatCount = count;
+ }
+
void SetQuiet(bool b) { this->Quiet = b; }
void InitResourceAllocator(const cmCTestResourceSpec& spec)
@@ -179,6 +185,8 @@ protected:
cmCTestTestHandler* TestHandler;
cmCTest* CTest;
bool HasCycles;
+ cmCTest::Repeat RepeatMode = cmCTest::Repeat::Never;
+ int RepeatCount = 1;
bool Quiet;
bool SerialTestRunning;
};
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index 8e3ac22639..9a060831b3 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -1231,6 +1231,8 @@ void cmCTestTestHandler::ProcessDirectory(std::vector<std::string>& passed,
parallel->SetCTest(this->CTest);
parallel->SetParallelLevel(this->CTest->GetParallelLevel());
parallel->SetTestHandler(this);
+ parallel->SetRepeatMode(this->CTest->GetRepeatMode(),
+ this->CTest->GetRepeatCount());
parallel->SetQuiet(this->Quiet);
if (this->TestLoad > 0) {
parallel->SetTestLoad(this->TestLoad);
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed65b3e984ccce9b915a5a71e5a8d13b892b63d8
commit ed65b3e984ccce9b915a5a71e5a8d13b892b63d8
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 7 11:21:03 2019 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 7 14:14:28 2019 -0500
CTest: Rename internal APIs for --repeat options
Replace use of the term "rerun" with "repeat" to match the public names.
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index 9ab3c2eff1..992a2ef96d 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -171,9 +171,9 @@ bool cmCTestMultiProcessHandler::StartTestProcess(int test)
this->RunningCount += GetProcessorsUsed(test);
cmCTestRunTest* testRun = new cmCTestRunTest(*this);
- if (this->CTest->GetRerunMode() != cmCTest::Rerun::Never) {
- testRun->SetRerunMode(this->CTest->GetRerunMode());
- testRun->SetNumberOfRuns(this->CTest->GetTestRepeat());
+ if (this->CTest->GetRepeatMode() != cmCTest::Repeat::Never) {
+ testRun->SetRepeatMode(this->CTest->GetRepeatMode());
+ testRun->SetNumberOfRuns(this->CTest->GetRepeatCount());
}
testRun->SetIndex(test);
testRun->SetTestProperties(this->Properties[test]);
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx
index 317f0b4086..cc5de43a9d 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@@ -307,7 +307,7 @@ bool cmCTestRunTest::EndTest(size_t completed, size_t total, bool started)
}
// If the test does not need to rerun push the current TestResult onto the
// TestHandler vector
- if (!this->NeedsToRerun()) {
+ if (!this->NeedsToRepeat()) {
this->TestHandler->TestResults.push_back(this->TestResult);
}
this->TestProcess.reset();
@@ -333,7 +333,7 @@ bool cmCTestRunTest::StartAgain(size_t completed)
return true;
}
-bool cmCTestRunTest::NeedsToRerun()
+bool cmCTestRunTest::NeedsToRepeat()
{
this->NumberOfRunsLeft--;
if (this->NumberOfRunsLeft == 0) {
@@ -342,11 +342,11 @@ bool cmCTestRunTest::NeedsToRerun()
// if number of runs left is not 0, and we are running until
// we find a failed (or passed) test, then return true so the test can be
// restarted
- if ((this->RerunMode == cmCTest::Rerun::UntilFail &&
+ if ((this->RepeatMode == cmCTest::Repeat::UntilFail &&
this->TestResult.Status == cmCTestTestHandler::COMPLETED) ||
- (this->RerunMode == cmCTest::Rerun::UntilPass &&
+ (this->RepeatMode == cmCTest::Repeat::UntilPass &&
this->TestResult.Status != cmCTestTestHandler::COMPLETED) ||
- (this->RerunMode == cmCTest::Rerun::AfterTimeout &&
+ (this->RepeatMode == cmCTest::Repeat::AfterTimeout &&
this->TestResult.Status == cmCTestTestHandler::TIMEOUT)) {
this->RunAgain = true;
return true;
@@ -748,8 +748,8 @@ void cmCTestRunTest::WriteLogOutputTop(size_t completed, size_t total)
// got for run until pass. Trick is when this is called we don't
// yet know if we are passing or failing.
bool const progressOnLast =
- (this->RerunMode != cmCTest::Rerun::UntilPass &&
- this->RerunMode != cmCTest::Rerun::AfterTimeout);
+ (this->RepeatMode != cmCTest::Repeat::UntilPass &&
+ this->RepeatMode != cmCTest::Repeat::AfterTimeout);
if ((progressOnLast && this->NumberOfRunsLeft == 1) ||
(!progressOnLast && this->NumberOfRunsLeft == this->NumberOfRunsTotal) ||
this->CTest->GetTestProgressOutput()) {
diff --git a/Source/CTest/cmCTestRunTest.h b/Source/CTest/cmCTestRunTest.h
index d5e83d9e4d..7eeaebd8dc 100644
--- a/Source/CTest/cmCTestRunTest.h
+++ b/Source/CTest/cmCTestRunTest.h
@@ -35,7 +35,7 @@ public:
this->NumberOfRunsTotal = n;
}
- void SetRerunMode(cmCTest::Rerun r) { this->RerunMode = r; }
+ void SetRepeatMode(cmCTest::Repeat r) { this->RepeatMode = r; }
void SetTestProperties(cmCTestTestHandler::cmCTestTestProperties* prop)
{
this->TestProperties = prop;
@@ -102,7 +102,7 @@ public:
}
private:
- bool NeedsToRerun();
+ bool NeedsToRepeat();
void DartProcessing();
void ExeNotFound(std::string exe);
bool ForkProcess(cmDuration testTimeOut, bool explicitTimeout,
@@ -136,7 +136,7 @@ private:
std::vector<std::map<
std::string, std::vector<cmCTestMultiProcessHandler::ResourceAllocation>>>
AllocatedResources;
- cmCTest::Rerun RerunMode = cmCTest::Rerun::Never;
+ cmCTest::Repeat RepeatMode = cmCTest::Repeat::Never;
int NumberOfRunsLeft = 1; // default to 1 run of the test
int NumberOfRunsTotal = 1; // default to 1 run of the test
bool RunAgain = false; // default to not having to run again
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 34e9479ce8..a49866ce98 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -83,8 +83,8 @@ struct cmCTest::Private
std::string Name;
};
- int RepeatTests = 1; // default to run each test once
- cmCTest::Rerun RerunMode = cmCTest::Rerun::Never;
+ int RepeatCount = 1; // default to run each test once
+ cmCTest::Repeat RepeatMode = cmCTest::Repeat::Never;
std::string ConfigType;
std::string ScheduleType;
std::chrono::system_clock::time_point StopTime;
@@ -1845,7 +1845,7 @@ bool cmCTest::HandleCommandLineArguments(size_t& i,
errormsg = "'--repeat-until-fail' requires an argument";
return false;
}
- if (this->Impl->RerunMode != cmCTest::Rerun::Never) {
+ if (this->Impl->RepeatMode != cmCTest::Repeat::Never) {
errormsg = "At most one '--repeat-*' option may be used.";
return false;
}
@@ -1856,9 +1856,9 @@ bool cmCTest::HandleCommandLineArguments(size_t& i,
"'--repeat-until-fail' given non-integer value '" + args[i] + "'";
return false;
}
- this->Impl->RepeatTests = static_cast<int>(repeat);
+ this->Impl->RepeatCount = static_cast<int>(repeat);
if (repeat > 1) {
- this->Impl->RerunMode = cmCTest::Rerun::UntilFail;
+ this->Impl->RepeatMode = cmCTest::Repeat::UntilFail;
}
}
@@ -1867,7 +1867,7 @@ bool cmCTest::HandleCommandLineArguments(size_t& i,
errormsg = "'--repeat-until-pass' requires an argument";
return false;
}
- if (this->Impl->RerunMode != cmCTest::Rerun::Never) {
+ if (this->Impl->RepeatMode != cmCTest::Repeat::Never) {
errormsg = "At most one '--repeat-*' option may be used.";
return false;
}
@@ -1878,9 +1878,9 @@ bool cmCTest::HandleCommandLineArguments(size_t& i,
"'--repeat-until-pass' given non-integer value '" + args[i] + "'";
return false;
}
- this->Impl->RepeatTests = static_cast<int>(repeat);
+ this->Impl->RepeatCount = static_cast<int>(repeat);
if (repeat > 1) {
- this->Impl->RerunMode = cmCTest::Rerun::UntilPass;
+ this->Impl->RepeatMode = cmCTest::Repeat::UntilPass;
}
}
@@ -1889,7 +1889,7 @@ bool cmCTest::HandleCommandLineArguments(size_t& i,
errormsg = "'--repeat-after-timeout' requires an argument";
return false;
}
- if (this->Impl->RerunMode != cmCTest::Rerun::Never) {
+ if (this->Impl->RepeatMode != cmCTest::Repeat::Never) {
errormsg = "At most one '--repeat-*' option may be used.";
return false;
}
@@ -1900,9 +1900,9 @@ bool cmCTest::HandleCommandLineArguments(size_t& i,
"'--repeat-after-timeout' given non-integer value '" + args[i] + "'";
return false;
}
- this->Impl->RepeatTests = static_cast<int>(repeat);
+ this->Impl->RepeatCount = static_cast<int>(repeat);
if (repeat > 1) {
- this->Impl->RerunMode = cmCTest::Rerun::AfterTimeout;
+ this->Impl->RepeatMode = cmCTest::Repeat::AfterTimeout;
}
}
@@ -2896,14 +2896,14 @@ const std::map<std::string, std::string>& cmCTest::GetDefinitions() const
return this->Impl->Definitions;
}
-int cmCTest::GetTestRepeat() const
+int cmCTest::GetRepeatCount() const
{
- return this->Impl->RepeatTests;
+ return this->Impl->RepeatCount;
}
-cmCTest::Rerun cmCTest::GetRerunMode() const
+cmCTest::Repeat cmCTest::GetRepeatMode() const
{
- return this->Impl->RerunMode;
+ return this->Impl->RepeatMode;
}
void cmCTest::SetBuildID(const std::string& id)
diff --git a/Source/cmCTest.h b/Source/cmCTest.h
index bef0f8d368..e0ae1000b0 100644
--- a/Source/cmCTest.h
+++ b/Source/cmCTest.h
@@ -431,16 +431,16 @@ public:
const std::map<std::string, std::string>& GetDefinitions() const;
/** Return the number of times a test should be run */
- int GetTestRepeat() const;
+ int GetRepeatCount() const;
- enum class Rerun
+ enum class Repeat
{
Never,
UntilFail,
UntilPass,
AfterTimeout,
};
- Rerun GetRerunMode() const;
+ Repeat GetRepeatMode() const;
void GenerateSubprojectsOutput(cmXMLWriter& xml);
std::vector<std::string> GetLabelsForSubprojects();
-----------------------------------------------------------------------
Summary of changes:
Help/command/ctest_test.rst | 20 +
Help/release/dev/ctest-repeat-until-pass.rst | 3 +
Source/CTest/cmCTestMultiProcessHandler.cxx | 6 +-
Source/CTest/cmCTestMultiProcessHandler.h | 10 +-
Source/CTest/cmCTestRunTest.cxx | 14 +-
Source/CTest/cmCTestRunTest.h | 6 +-
Source/CTest/cmCTestTestCommand.cxx | 4 +
Source/CTest/cmCTestTestCommand.h | 1 +
Source/CTest/cmCTestTestHandler.cxx | 30 +
Source/CTest/cmCTestTestHandler.h | 4 +-
Source/LexerParser/cmCommandArgumentParser.cxx | 121 +-
Source/LexerParser/cmCommandArgumentParserTokens.h | 2 +-
Source/LexerParser/cmDependsJavaParser.cxx | 1381 ++++++++++----------
Source/LexerParser/cmDependsJavaParserTokens.h | 2 +-
Source/LexerParser/cmExprParser.cxx | 121 +-
Source/LexerParser/cmExprParserTokens.h | 2 +-
Source/LexerParser/cmFortranParser.cxx | 372 +++---
Source/LexerParser/cmFortranParser.y | 1 +
Source/LexerParser/cmFortranParserTokens.h | 9 +-
Source/cmCTest.cxx | 30 +-
Source/cmCTest.h | 6 +-
Source/cmFileLock.cxx | 25 +
Source/cmFileLock.h | 2 +
Source/cmFileLockPool.cxx | 52 +-
Source/cmFileLockPool.h | 14 +-
Tests/RunCMake/ctest_test/RunCMakeTest.cmake | 22 +-
.../ctest_test/TestRepeatAfterTimeout-stdout.txt | 10 +
.../ctest_test/TestRepeatAfterTimeout.cmake | 10 +
.../TestRepeatBad1-result.txt} | 0
.../RunCMake/ctest_test/TestRepeatBad1-stderr.txt | 1 +
.../TestRepeatBad2-result.txt} | 0
.../RunCMake/ctest_test/TestRepeatBad2-stderr.txt | 1 +
.../ctest_test/TestRepeatUntilFail-stdout.txt | 13 +
.../RunCMake/ctest_test/TestRepeatUntilFail.cmake | 9 +
.../ctest_test/TestRepeatUntilPass-stdout.txt | 10 +
.../RunCMake/ctest_test/TestRepeatUntilPass.cmake | 9 +
Utilities/IWYU/mapping.imp | 2 +
37 files changed, 1262 insertions(+), 1063 deletions(-)
create mode 100644 Tests/RunCMake/ctest_test/TestRepeatAfterTimeout-stdout.txt
create mode 100644 Tests/RunCMake/ctest_test/TestRepeatAfterTimeout.cmake
copy Tests/RunCMake/{CTestCommandExpandLists/expandEmptyCommand-result.txt => ctest_test/TestRepeatBad1-result.txt} (100%)
create mode 100644 Tests/RunCMake/ctest_test/TestRepeatBad1-stderr.txt
copy Tests/RunCMake/{CTestCommandExpandLists/expandEmptyCommand-result.txt => ctest_test/TestRepeatBad2-result.txt} (100%)
create mode 100644 Tests/RunCMake/ctest_test/TestRepeatBad2-stderr.txt
create mode 100644 Tests/RunCMake/ctest_test/TestRepeatUntilFail-stdout.txt
create mode 100644 Tests/RunCMake/ctest_test/TestRepeatUntilFail.cmake
create mode 100644 Tests/RunCMake/ctest_test/TestRepeatUntilPass-stdout.txt
create mode 100644 Tests/RunCMake/ctest_test/TestRepeatUntilPass.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list