Menu
▾
▴
[Openjade-checkins] CVS: sp/include ArcEngine.h,1.2,1.3 Attribute.h,1.2,1.3 CmdLineApp.h,1.9,1.10 Entity.h,1.1,1.2 Makefile.am,1.6,1.7 Message.h,1.3,1.4 MessageArg.h,1.2,1.3 MessageFormatter.h,1.3,1.4 MessageTable.h,1.3,1.4 Mode.h,1.1,1.2 SgmlParser.h,1.1,1.2 SubstTable.h,1.5,1.6 Syntax.h,1.3,1.4 config.h.old.in,1.3,1.4 constant.h,1.2,1.3
|
From: Ian C. <ic...@us...> - 2002-05-10 11:07:32
|
Update of /cvsroot/openjade/sp/include
In directory usw-pr-cvs1:/tmp/cvs-serv19299/include
Modified Files:
ArcEngine.h Attribute.h CmdLineApp.h Entity.h Makefile.am
Message.h MessageArg.h MessageFormatter.h MessageTable.h
Mode.h SgmlParser.h SubstTable.h Syntax.h config.h.old.in
constant.h
Log Message:
Merge from opensp_1_5_branch part I. Updated and removed files.
Index: ArcEngine.h
===================================================================
RCS file: /cvsroot/openjade/sp/include/ArcEngine.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ArcEngine.h 21 Feb 2000 19:46:31 -0000 1.2
--- ArcEngine.h 10 May 2002 11:07:29 -0000 1.3
***************
*** 20,24 ****
class SP_API ArcDirector {
public:
! virtual EventHandler *arcEventHandler(const Notation *,
const Vector<StringC> &,
const SubstTable *) = 0;
--- 20,25 ----
class SP_API ArcDirector {
public:
! virtual EventHandler *arcEventHandler(const StringC *arcPublicId,
! const Notation *,
const Vector<StringC> &,
const SubstTable *) = 0;
***************
*** 29,33 ****
SelectOneArcDirector(const Vector<StringC> &select, EventHandler &eh)
: select_(select), eh_(&eh) { }
! EventHandler *arcEventHandler(const Notation *,
const Vector<StringC> &,
const SubstTable *);
--- 30,35 ----
SelectOneArcDirector(const Vector<StringC> &select, EventHandler &eh)
: select_(select), eh_(&eh) { }
! EventHandler *arcEventHandler(const StringC *,
! const Notation *,
const Vector<StringC> &,
const SubstTable *);
Index: Attribute.h
===================================================================
RCS file: /cvsroot/openjade/sp/include/Attribute.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Attribute.h 16 Dec 1999 22:11:29 -0000 1.2
--- Attribute.h 10 May 2002 11:07:29 -0000 1.3
***************
*** 250,256 ****
--- 250,260 ----
virtual AttributeDefinition *copy() const = 0;
void setDeclaredValue(DeclaredValue *);
+ void setSpecified(Boolean implicit);
+ Boolean isSpecified(Boolean &implicit);
private:
virtual void buildDesc(AttributeDefinitionDesc &) const = 0;
virtual AttributeValue *checkValue(AttributeValue *, AttributeContext &) const;
+ PackedBoolean implicit_;
+ PackedBoolean all_;
StringC name_;
CopyOwner<DeclaredValue> declaredValue_;
Index: CmdLineApp.h
===================================================================
RCS file: /cvsroot/openjade/sp/include/CmdLineApp.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** CmdLineApp.h 26 Sep 2001 23:42:13 -0000 1.9
--- CmdLineApp.h 10 May 2002 11:07:29 -0000 1.10
***************
*** 99,102 ****
--- 99,103 ----
#else
#define SP_DEFINE_APP(CLASS) \
+ extern "C" \
int main(int argc, char **argv) { CLASS app; return app.run(argc, argv); }
#endif
Index: Entity.h
===================================================================
RCS file: /cvsroot/openjade/sp/include/Entity.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Entity.h 4 Nov 1999 08:36:02 -0000 1.1
--- Entity.h 10 May 2002 11:07:29 -0000 1.2
***************
*** 100,104 ****
};
! class PiEntity : public InternalEntity {
public:
PiEntity(const StringC &, DeclType, const Location &, Text &);
--- 100,104 ----
};
! class SP_API PiEntity : public InternalEntity {
public:
PiEntity(const StringC &, DeclType, const Location &, Text &);
Index: Makefile.am
===================================================================
RCS file: /cvsroot/openjade/sp/include/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Makefile.am 24 Feb 2000 18:07:42 -0000 1.6
--- Makefile.am 10 May 2002 11:07:29 -0000 1.7
***************
*** 16,21 ****
LiteralStorage.h Location.h Lpd.h Markup.h Message.h MessageArg.h \
MessageBuilder.h MessageEventHandler.h MessageFormatter.h \
! MessageReporter.h MessageTable.h Mode.h NCVector.h Named.h \
! NamedResource.h NamedResourceTable.h NamedTable.h Notation.h \
NotationStorage.h OpenElement.h Options.cxx Options.h \
OutputByteStream.h OutputCharStream.h Owner.cxx Owner.h \
--- 16,21 ----
LiteralStorage.h Location.h Lpd.h Markup.h Message.h MessageArg.h \
MessageBuilder.h MessageEventHandler.h MessageFormatter.h \
! MessageModule.h MessageReporter.h MessageTable.h Mode.h NCVector.h \
! Named.h NamedResource.h NamedResourceTable.h NamedTable.h Notation.h \
NotationStorage.h OpenElement.h Options.cxx Options.h \
OutputByteStream.h OutputCharStream.h Owner.cxx Owner.h \
***************
*** 35,37 ****
## We don't install the windows-only headers on unix systems, but
## we still include it in the distribution
! EXTRA_DIST = Win32CodingSystem.h WinApp.h WinInetStorage.h config.h.old
--- 35,40 ----
## We don't install the windows-only headers on unix systems, but
## we still include it in the distribution
! EXTRA_DIST = Win32CodingSystem.h WinApp.h WinInetStorage.h config.h.old \
! .cvsignore
!
! MAINTAINERCLEANFILES = Makefile.in
Index: Message.h
===================================================================
RCS file: /cvsroot/openjade/sp/include/Message.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Message.h 16 Dec 1999 22:11:29 -0000 1.3
--- Message.h 10 May 2002 11:07:29 -0000 1.4
***************
*** 21,40 ****
#endif
class SP_API MessageFragment {
public:
! enum {
! libModule = 0,
! appModule = 1,
! xModule = 2
! };
! enum { nModules = xModule + 1 };
! MessageFragment(unsigned module = libModule,
! unsigned number = unsigned(-1), const char *text = 0);
! unsigned module() const;
unsigned number() const;
const char *text() const;
private:
unsigned short number_;
! unsigned char module_;
protected:
unsigned char spare_;
--- 21,37 ----
#endif
+ class MessageModule;
+ extern MessageModule libModule;
+ extern MessageModule appModule;
+
class SP_API MessageFragment {
public:
! MessageFragment(const MessageModule *module, unsigned number, const char *text = 0);
! const MessageModule *module() const;
unsigned number() const;
const char *text() const;
private:
unsigned short number_;
! const MessageModule * module_;
protected:
unsigned char spare_;
***************
*** 54,58 ****
error
};
! MessageType(Severity = info, unsigned module = libModule,
unsigned number = unsigned(-1),
const char *text = 0, const char *clauses = 0,
--- 51,55 ----
error
};
! MessageType(Severity = info, const MessageModule *module = &libModule,
unsigned number = unsigned(-1),
const char *text = 0, const char *clauses = 0,
***************
*** 72,76 ****
class SP_API MessageType0 : public MessageType {
public:
! MessageType0(Severity = info, unsigned module = libModule,
unsigned number = unsigned(-1), const char *text = 0,
const char *clauses = 0);
--- 69,73 ----
class SP_API MessageType0 : public MessageType {
public:
! MessageType0(Severity = info, const MessageModule *module = &libModule,
unsigned number = unsigned(-1), const char *text = 0,
const char *clauses = 0);
***************
*** 79,83 ****
class SP_API MessageType1 : public MessageType {
public:
! MessageType1(Severity = info, unsigned module = libModule,
unsigned number = unsigned(-1), const char *text = 0,
const char *clauses = 0);
--- 76,80 ----
class SP_API MessageType1 : public MessageType {
public:
! MessageType1(Severity = info, const MessageModule *module = &libModule,
unsigned number = unsigned(-1), const char *text = 0,
const char *clauses = 0);
***************
*** 86,90 ****
class SP_API MessageType2 : public MessageType {
public:
! MessageType2(Severity = info, unsigned module = libModule,
unsigned number = unsigned(-1), const char *text = 0,
const char *clauses = 0);
--- 83,87 ----
class SP_API MessageType2 : public MessageType {
public:
! MessageType2(Severity = info, const MessageModule *module = &libModule,
unsigned number = unsigned(-1), const char *text = 0,
const char *clauses = 0);
***************
*** 93,97 ****
class SP_API MessageType3 : public MessageType {
public:
! MessageType3(Severity = info, unsigned module = libModule,
unsigned number = unsigned(-1), const char *text = 0,
const char *clauses = 0);
--- 90,94 ----
class SP_API MessageType3 : public MessageType {
public:
! MessageType3(Severity = info, const MessageModule *module = &libModule,
unsigned number = unsigned(-1), const char *text = 0,
const char *clauses = 0);
***************
*** 100,104 ****
class SP_API MessageType4 : public MessageType {
public:
! MessageType4(Severity = info, unsigned module = libModule,
unsigned number = unsigned(-1), const char *text = 0,
const char *clauses = 0);
--- 97,101 ----
class SP_API MessageType4 : public MessageType {
public:
! MessageType4(Severity = info, const MessageModule *module = &libModule,
unsigned number = unsigned(-1), const char *text = 0,
const char *clauses = 0);
***************
*** 107,111 ****
class SP_API MessageType5 : public MessageType {
public:
! MessageType5(Severity = info, unsigned module = libModule,
unsigned number = unsigned(-1), const char *text = 0,
const char *clauses = 0);
--- 104,108 ----
class SP_API MessageType5 : public MessageType {
public:
! MessageType5(Severity = info, const MessageModule *module = &libModule,
unsigned number = unsigned(-1), const char *text = 0,
const char *clauses = 0);
***************
*** 114,118 ****
class SP_API MessageType6 : public MessageType {
public:
! MessageType6(Severity = info, unsigned module = libModule,
unsigned number = unsigned(-1), const char *text = 0,
const char *clauses = 0);
--- 111,115 ----
class SP_API MessageType6 : public MessageType {
public:
! MessageType6(Severity = info, const MessageModule *module = &libModule,
unsigned number = unsigned(-1), const char *text = 0,
const char *clauses = 0);
***************
*** 121,125 ****
class SP_API MessageType0L : public MessageType {
public:
! MessageType0L(Severity = info, unsigned module = libModule,
unsigned number = unsigned(-1), const char *text = 0,
const char *clauses = 0, const char *auxText = 0);
--- 118,122 ----
class SP_API MessageType0L : public MessageType {
public:
! MessageType0L(Severity = info, const MessageModule *module = &libModule,
unsigned number = unsigned(-1), const char *text = 0,
const char *clauses = 0, const char *auxText = 0);
***************
*** 128,132 ****
class SP_API MessageType1L : public MessageType {
public:
! MessageType1L(Severity = info, unsigned module = libModule,
unsigned number = unsigned(-1), const char *text = 0,
const char *clauses = 0, const char *auxText = 0);
--- 125,129 ----
class SP_API MessageType1L : public MessageType {
public:
! MessageType1L(Severity = info, const MessageModule *module = &libModule,
unsigned number = unsigned(-1), const char *text = 0,
const char *clauses = 0, const char *auxText = 0);
***************
*** 221,225 ****
inline
! unsigned MessageFragment::module() const
{
return module_;
--- 218,222 ----
inline
! const MessageModule *MessageFragment::module() const
{
return module_;
Index: MessageArg.h
===================================================================
RCS file: /cvsroot/openjade/sp/include/MessageArg.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** MessageArg.h 8 Feb 2000 16:59:28 -0000 1.2
--- MessageArg.h 10 May 2002 11:07:29 -0000 1.3
***************
*** 60,64 ****
};
! SP_API class StringVectorMessageArg : public MessageArg {
public:
StringVectorMessageArg(const Vector<StringC> &);
--- 60,64 ----
};
! class SP_API StringVectorMessageArg : public MessageArg {
public:
StringVectorMessageArg(const Vector<StringC> &);
Index: MessageFormatter.h
===================================================================
RCS file: /cvsroot/openjade/sp/include/MessageFormatter.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** MessageFormatter.h 26 Sep 2001 23:39:55 -0000 1.3
--- MessageFormatter.h 10 May 2002 11:07:29 -0000 1.4
***************
*** 34,38 ****
MessageFormatter(const MessageFormatter &); // undefined
void operator=(const MessageFormatter &); // undefined
!
class Builder : public MessageBuilder {
public:
--- 34,38 ----
MessageFormatter(const MessageFormatter &); // undefined
void operator=(const MessageFormatter &); // undefined
! protected:
class Builder : public MessageBuilder {
public:
Index: MessageTable.h
===================================================================
RCS file: /cvsroot/openjade/sp/include/MessageTable.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** MessageTable.h 29 Nov 1999 17:32:35 -0000 1.3
--- MessageTable.h 10 May 2002 11:07:29 -0000 1.4
***************
*** 18,21 ****
--- 18,23 ----
#endif
+ class MessageModule;
+
class SP_API MessageTable {
public:
***************
*** 23,27 ****
virtual Boolean getText(const MessageFragment &,
String<SP_TCHAR> &) const = 0;
! virtual void registerMessageDomain(unsigned char, char *, char *d = 0) const {};
};
--- 25,29 ----
virtual Boolean getText(const MessageFragment &,
String<SP_TCHAR> &) const = 0;
! virtual void registerMessageDomain(MessageModule &, char *, char *d = 0) const {};
};
Index: Mode.h
===================================================================
RCS file: /cvsroot/openjade/sp/include/Mode.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Mode.h 4 Nov 1999 08:36:04 -0000 1.1
--- Mode.h 10 May 2002 11:07:29 -0000 1.2
***************
*** 45,48 ****
--- 45,49 ----
mlitaMode, // minimum literal starting with LITA
asMode, // data/link/result attribute specification
+ piPasMode, // pi pseudo-attribute specification
slitMode, // system id literal starting with LIT
slitaMode, // system id literal starting with LITA
Index: SgmlParser.h
===================================================================
RCS file: /cvsroot/openjade/sp/include/SgmlParser.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** SgmlParser.h 4 Nov 1999 08:36:06 -0000 1.1
--- SgmlParser.h 10 May 2002 11:07:29 -0000 1.2
***************
*** 74,77 ****
--- 74,78 ----
void swap(SgmlParser &);
friend class Parser;
+ friend class PiAttspecParser;
private:
SgmlParser(const SgmlParser &);
Index: SubstTable.h
===================================================================
RCS file: /cvsroot/openjade/sp/include/SubstTable.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** SubstTable.h 19 Mar 2001 16:00:18 -0000 1.5
--- SubstTable.h 10 May 2002 11:07:29 -0000 1.6
***************
*** 13,17 ****
#endif
! class SubstTable {
public:
SubstTable();
--- 13,17 ----
#endif
! class SP_API SubstTable {
public:
SubstTable();
***************
*** 36,45 ****
};
- inline
- void SubstTable::subst(Char &c) const
- {
- c = operator[](c);
- }
-
inline
void SubstTable::subst(StringC &str) const
--- 36,39 ----
***************
*** 56,59 ****
--- 50,59 ----
else
return at(t);
+ }
+
+ inline
+ void SubstTable::subst(Char &c) const
+ {
+ c = operator[](c);
}
Index: Syntax.h
===================================================================
RCS file: /cvsroot/openjade/sp/include/Syntax.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Syntax.h 25 Feb 2000 13:19:10 -0000 1.3
--- Syntax.h 10 May 2002 11:07:29 -0000 1.4
***************
*** 180,183 ****
--- 180,184 ----
Syntax(const Sd &);
Boolean lookupFunctionChar(const StringC &, Char *) const;
+ HashTableIter<StringC,Char> functionIter() const;
Boolean charFunctionName(Char c, const StringC *&name) const;
Boolean lookupReservedName(const StringC &, ReservedName *) const;
Index: config.h.old.in
===================================================================
RCS file: /cvsroot/openjade/sp/include/config.h.old.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** config.h.old.in 30 Mar 2000 06:57:54 -0000 1.3
--- config.h.old.in 10 May 2002 11:07:29 -0000 1.4
***************
*** 22,26 ****
#undef SP_NEW_H_MISSING
#endif
!
#endif /* __GNUG__ */
--- 22,28 ----
#undef SP_NEW_H_MISSING
#endif
! #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 9)
! #undef SP_NO_STD_NAMESPACE
! #endif
#endif /* __GNUG__ */
Index: constant.h
===================================================================
RCS file: /cvsroot/openjade/sp/include/constant.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** constant.h 26 Feb 2000 21:52:46 -0000 1.2
--- constant.h 10 May 2002 11:07:29 -0000 1.3
***************
*** 2,5 ****
--- 2,7 ----
#define constant_INCLUDED 1
+ #include "types.h"
+
#ifdef SP_NAMESPACE
namespace SP_NAMESPACE {
|