You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by tn...@apache.org on 2002/02/05 14:20:07 UTC
cvs commit: xml-xerces/c/src/xercesc/util/regx ASCIIRangeFactory.cpp ASCIIRangeFactory.hpp BlockRangeFactory.cpp BlockRangeFactory.hpp RegxDefs.hpp UnicodeRangeFactory.cpp UnicodeRangeFactory.hpp XMLRangeFactory.cpp XMLRangeFactory.hpp
tng 02/02/05 05:20:07
Modified: c/src/xercesc/util/regx ASCIIRangeFactory.cpp
ASCIIRangeFactory.hpp BlockRangeFactory.cpp
BlockRangeFactory.hpp RegxDefs.hpp
UnicodeRangeFactory.cpp UnicodeRangeFactory.hpp
XMLRangeFactory.cpp XMLRangeFactory.hpp
Log:
[Bug 5716] Can't parse with Validation more than one file.
Revision Changes Path
1.2 +8 -9 xml-xerces/c/src/xercesc/util/regx/ASCIIRangeFactory.cpp
Index: ASCIIRangeFactory.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/ASCIIRangeFactory.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ASCIIRangeFactory.cpp 1 Feb 2002 22:22:28 -0000 1.1
+++ ASCIIRangeFactory.cpp 5 Feb 2002 13:20:06 -0000 1.2
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,8 +56,11 @@
/*
* $Log: ASCIIRangeFactory.cpp,v $
- * Revision 1.1 2002/02/01 22:22:28 peiyongz
- * Initial revision
+ * Revision 1.2 2002/02/05 13:20:06 tng
+ * [Bug 5716] Can't parse with Validation more than one file.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:28 peiyongz
+ * sane_include
*
* Revision 1.3 2001/05/11 13:26:39 tng
* Copyright update.
@@ -93,16 +96,12 @@
// ---------------------------------------------------------------------------
-// Static member data initialization
-// ---------------------------------------------------------------------------
-bool ASCIIRangeFactory::fRangesCreated = false;
-bool ASCIIRangeFactory::fKeywordsInitialized = false;
-
-// ---------------------------------------------------------------------------
// ASCIIRangeFactory: Constructors and Destructor
// ---------------------------------------------------------------------------
-ASCIIRangeFactory::ASCIIRangeFactory() {
-
+ASCIIRangeFactory::ASCIIRangeFactory() :
+ fRangesCreated(false)
+ , fKeywordsInitialized(false)
+{
}
ASCIIRangeFactory::~ASCIIRangeFactory() {
1.2 +4 -4 xml-xerces/c/src/xercesc/util/regx/ASCIIRangeFactory.hpp
Index: ASCIIRangeFactory.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/ASCIIRangeFactory.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ASCIIRangeFactory.hpp 1 Feb 2002 22:22:28 -0000 1.1
+++ ASCIIRangeFactory.hpp 5 Feb 2002 13:20:06 -0000 1.2
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,7 +55,7 @@
*/
/*
- * $Id: ASCIIRangeFactory.hpp,v 1.1 2002/02/01 22:22:28 peiyongz Exp $
+ * $Id: ASCIIRangeFactory.hpp,v 1.2 2002/02/05 13:20:06 tng Exp $
*/
#if !defined(ASCIIRANGEFACTORY_HPP)
@@ -94,8 +94,8 @@
ASCIIRangeFactory(const ASCIIRangeFactory&);
void operator=(const ASCIIRangeFactory&);
- static bool fRangesCreated;
- static bool fKeywordsInitialized;
+ bool fRangesCreated;
+ bool fKeywordsInitialized;
};
#endif
1.2 +8 -8 xml-xerces/c/src/xercesc/util/regx/BlockRangeFactory.cpp
Index: BlockRangeFactory.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/BlockRangeFactory.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BlockRangeFactory.cpp 1 Feb 2002 22:22:28 -0000 1.1
+++ BlockRangeFactory.cpp 5 Feb 2002 13:20:06 -0000 1.2
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,8 +56,11 @@
/*
* $Log: BlockRangeFactory.cpp,v $
- * Revision 1.1 2002/02/01 22:22:28 peiyongz
- * Initial revision
+ * Revision 1.2 2002/02/05 13:20:06 tng
+ * [Bug 5716] Can't parse with Validation more than one file.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:28 peiyongz
+ * sane_include
*
* Revision 1.6 2001/11/09 21:27:21 tng
* Schema Regx Fix: manually add the extra specials and private use block range.
@@ -103,12 +106,6 @@
// ---------------------------------------------------------------------------
-// Static member data initialization
-// ---------------------------------------------------------------------------
-bool BlockRangeFactory::fRangesCreated = false;
-bool BlockRangeFactory::fKeywordsInitialized = false;
-
-// ---------------------------------------------------------------------------
// Local static data
// ---------------------------------------------------------------------------
const int BLOCKNAMESIZE = 96;
@@ -379,7 +376,10 @@
// ---------------------------------------------------------------------------
// BlockRangeFactory: Constructors and Destructor
// ---------------------------------------------------------------------------
-BlockRangeFactory::BlockRangeFactory() {
+BlockRangeFactory::BlockRangeFactory() :
+ fRangesCreated(false)
+ , fKeywordsInitialized(false)
+{
}
1.2 +4 -4 xml-xerces/c/src/xercesc/util/regx/BlockRangeFactory.hpp
Index: BlockRangeFactory.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/BlockRangeFactory.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BlockRangeFactory.hpp 1 Feb 2002 22:22:28 -0000 1.1
+++ BlockRangeFactory.hpp 5 Feb 2002 13:20:06 -0000 1.2
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,7 +55,7 @@
*/
/*
- * $Id: BlockRangeFactory.hpp,v 1.1 2002/02/01 22:22:28 peiyongz Exp $
+ * $Id: BlockRangeFactory.hpp,v 1.2 2002/02/05 13:20:06 tng Exp $
*/
#if !defined(BLOCKRANGEFACTORY_HPP)
@@ -94,8 +94,8 @@
BlockRangeFactory(const BlockRangeFactory&);
void operator=(const BlockRangeFactory&);
- static bool fRangesCreated;
- static bool fKeywordsInitialized;
+ bool fRangesCreated;
+ bool fKeywordsInitialized;
};
#endif
1.2 +3 -3 xml-xerces/c/src/xercesc/util/regx/RegxDefs.hpp
Index: RegxDefs.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/RegxDefs.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RegxDefs.hpp 1 Feb 2002 22:22:30 -0000 1.1
+++ RegxDefs.hpp 5 Feb 2002 13:20:06 -0000 1.2
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,7 +55,7 @@
*/
/*
- * $Id: RegxDefs.hpp,v 1.1 2002/02/01 22:22:30 peiyongz Exp $
+ * $Id: RegxDefs.hpp,v 1.2 2002/02/05 13:20:06 tng Exp $
*/
#if !defined(REGXDEFS_HPP)
@@ -72,7 +72,7 @@
chLatin_X, chLatin_M, chLatin_L, chNull
};
-static const XMLCh fgASCIICategory[] =
+const XMLCh fgASCIICategory[] =
{
chLatin_A, chLatin_S, chLatin_C, chLatin_I, chLatin_I, chNull
};
1.2 +8 -10 xml-xerces/c/src/xercesc/util/regx/UnicodeRangeFactory.cpp
Index: UnicodeRangeFactory.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/UnicodeRangeFactory.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UnicodeRangeFactory.cpp 1 Feb 2002 22:22:34 -0000 1.1
+++ UnicodeRangeFactory.cpp 5 Feb 2002 13:20:06 -0000 1.2
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,8 +56,11 @@
/*
* $Log: UnicodeRangeFactory.cpp,v $
- * Revision 1.1 2002/02/01 22:22:34 peiyongz
- * Initial revision
+ * Revision 1.2 2002/02/05 13:20:06 tng
+ * [Bug 5716] Can't parse with Validation more than one file.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:34 peiyongz
+ * sane_include
*
* Revision 1.4 2001/10/15 18:30:40 knoaman
* Add support for 'Pi' and 'Pf'.
@@ -95,13 +98,6 @@
#include <xercesc/util/regx/RegxDefs.hpp>
#include <xercesc/util/regx/XMLUniCharacter.hpp>
-
-// ---------------------------------------------------------------------------
-// Static member data initialization
-// ---------------------------------------------------------------------------
-bool UnicodeRangeFactory::fRangesCreated = false;
-bool UnicodeRangeFactory::fKeywordsInitialized = false;
-
// ---------------------------------------------------------------------------
// Local data
// ---------------------------------------------------------------------------
@@ -158,8 +154,10 @@
// ---------------------------------------------------------------------------
// UnicodeRangeFactory: Constructors and Destructor
// ---------------------------------------------------------------------------
-UnicodeRangeFactory::UnicodeRangeFactory() {
-
+UnicodeRangeFactory::UnicodeRangeFactory() :
+ fRangesCreated(false)
+ , fKeywordsInitialized(false)
+{
}
UnicodeRangeFactory::~UnicodeRangeFactory() {
1.2 +5 -5 xml-xerces/c/src/xercesc/util/regx/UnicodeRangeFactory.hpp
Index: UnicodeRangeFactory.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/UnicodeRangeFactory.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UnicodeRangeFactory.hpp 1 Feb 2002 22:22:34 -0000 1.1
+++ UnicodeRangeFactory.hpp 5 Feb 2002 13:20:06 -0000 1.2
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,7 +55,7 @@
*/
/*
- * $Id: UnicodeRangeFactory.hpp,v 1.1 2002/02/01 22:22:34 peiyongz Exp $
+ * $Id: UnicodeRangeFactory.hpp,v 1.2 2002/02/05 13:20:06 tng Exp $
*/
#if !defined(UNICODERANGEFACTORY_HPP)
@@ -97,10 +97,10 @@
// -----------------------------------------------------------------------
// Helper methods
// -----------------------------------------------------------------------
- unsigned short getUniCategory(const unsigned short type);
+ unsigned short getUniCategory(const unsigned short type);
- static bool fRangesCreated;
- static bool fKeywordsInitialized;
+ bool fRangesCreated;
+ bool fKeywordsInitialized;
};
#endif
1.2 +8 -8 xml-xerces/c/src/xercesc/util/regx/XMLRangeFactory.cpp
Index: XMLRangeFactory.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/XMLRangeFactory.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLRangeFactory.cpp 1 Feb 2002 22:22:34 -0000 1.1
+++ XMLRangeFactory.cpp 5 Feb 2002 13:20:06 -0000 1.2
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,8 +56,11 @@
/*
* $Log: XMLRangeFactory.cpp,v $
- * Revision 1.1 2002/02/01 22:22:34 peiyongz
- * Initial revision
+ * Revision 1.2 2002/02/05 13:20:06 tng
+ * [Bug 5716] Can't parse with Validation more than one file.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:34 peiyongz
+ * sane_include
*
* Revision 1.4 2001/10/15 20:18:32 knoaman
* Fix for bug 4177.
@@ -97,12 +100,6 @@
// ---------------------------------------------------------------------------
-// Static member data initialization
-// ---------------------------------------------------------------------------
-bool XMLRangeFactory::fRangesCreated = false;
-bool XMLRangeFactory::fKeywordsInitialized = false;
-
-// ---------------------------------------------------------------------------
// Local static functions
// ---------------------------------------------------------------------------
static void setupRange(RangeToken* const rangeTok,
@@ -132,7 +129,10 @@
// ---------------------------------------------------------------------------
// XMLRangeFactory: Constructors and Destructor
// ---------------------------------------------------------------------------
-XMLRangeFactory::XMLRangeFactory() {
+XMLRangeFactory::XMLRangeFactory() :
+ fRangesCreated(false)
+ , fKeywordsInitialized(false)
+{
}
1.2 +4 -4 xml-xerces/c/src/xercesc/util/regx/XMLRangeFactory.hpp
Index: XMLRangeFactory.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/XMLRangeFactory.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLRangeFactory.hpp 1 Feb 2002 22:22:34 -0000 1.1
+++ XMLRangeFactory.hpp 5 Feb 2002 13:20:06 -0000 1.2
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,7 +55,7 @@
*/
/*
- * $Id: XMLRangeFactory.hpp,v 1.1 2002/02/01 22:22:34 peiyongz Exp $
+ * $Id: XMLRangeFactory.hpp,v 1.2 2002/02/05 13:20:06 tng Exp $
*/
#if !defined(XMLRANGEFACTORY_HPP)
@@ -94,8 +94,8 @@
XMLRangeFactory(const XMLRangeFactory&);
void operator=(const XMLRangeFactory&);
- static bool fRangesCreated;
- static bool fKeywordsInitialized;
+ bool fRangesCreated;
+ bool fKeywordsInitialized;
};
#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org