diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/ContentType.ll b/cde/programs/dtinfo/dtinfogen/infolib/etc/ContentType.ll index ca3b8b1f9..9118e7387 100644 --- a/cde/programs/dtinfo/dtinfogen/infolib/etc/ContentType.ll +++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/ContentType.ll @@ -13,7 +13,7 @@ using namespace std; #include #include -#include "Exceptions.hh" +#include "dti_excs/Exceptions.hh" #include "Task.h" #include "SGMLName.h" @@ -24,7 +24,7 @@ using namespace std; #include "api/utility.h" /* CurrentContentPtr is used as the communication media between - * yyparse and ContentType::Parse() + * ol_dataparse and ContentType::Parse() */ ContentType *CurrentContentPtr; @@ -33,7 +33,7 @@ ContentType *CurrentContentPtr; * Forward declaration for my_input */ static int my_input ( char *, int ); -extern int yyparse(); +extern int ol_dataparse(); #undef YY_INPUT @@ -57,7 +57,7 @@ static int dbgLevel = -1; %% "@"[a-zA-Z0-9]+ { - yylval.name = SGMLName::intern((const char *)yytext+1 ,1); + ol_datalval.name = SGMLName::intern((const char *)yytext+1 ,1); return( Reference ); } ["][^"]*["] { @@ -70,14 +70,14 @@ static int dbgLevel = -1; len ); *(lit_str + len) = '\0'; - yylval.string = lit_str; + ol_datalval.string = lit_str; } else { - yylval.string = 0; + ol_datalval.string = 0; } DBG(50) cerr << "(DEBUG) literal \"string\" = " - << yylval.string << endl; + << ol_datalval.string << endl; return( Literal ); } @@ -91,15 +91,15 @@ static int dbgLevel = -1; len ); *(lit_str + len) = '\0'; - yylval.string = lit_str; + ol_datalval.string = lit_str; } else { - yylval.string = 0; + ol_datalval.string = 0; } DBG(50) cerr << "(DEBUG) literal 'string' = " - << yylval.string << endl; + << ol_datalval.string << endl; return( Literal ); } @@ -109,9 +109,9 @@ static int dbgLevel = -1; [Ff][Ii][Rr][Ss][Tt][Oo][Ff] { return( FirstOf); } "#"[Cc][Oo][Nn][Tt][Ee][Nn][Tt] { return( Content ); } [^(,)\n\t ]+ { - yylval.name = SGMLName::intern((const char *)yytext,1); + ol_datalval.name = SGMLName::intern((const char *)yytext,1); DBG(10) cerr << "(DEBUG) matches" - << (char *)SGMLName::lookup(yylval.name) + << (char *)SGMLName::lookup(ol_datalval.name) << endl; return ( Id ); } @@ -184,7 +184,7 @@ ContentType::Parse( char *str ) CurrentContentPtr = this; - yyparse(); + ol_dataparse(); BEGIN INITIAL; yyrestart(NULL); diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/Makefile.am b/cde/programs/dtinfo/dtinfogen/infolib/etc/Makefile.am new file mode 100644 index 000000000..c1f050cb7 --- /dev/null +++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/Makefile.am @@ -0,0 +1,88 @@ +MAINTAINERCLEANFILES = Makefile.in + +dist_bin_SCRIPTS = dtinfogen + +libexec_PROGRAMS = MixedGen \ + NCFGen \ + NodeParser \ + StyleUpdate \ + dtinfogen_worker + +AM_CXXFLAGS = -DEXPAND_TEMPLATES -DDtinfoClient -I$(top_builddir)/lib/DtMmdb +AM_LDFLAGS = $(XTOOLLIB) $(LIBMMDB) $(DTCLIENTLIBS) + +OLAFPARSESRC = AttributeData.C \ + AttributeList.C \ + AttributeRec.C \ + AusText.C \ + AusTextStorage.C \ + BookCaseDB.C \ + BookTasks.C \ + BTCollectable.C \ + ConcatTask.C \ + Content.C \ + OL_DataExpr.C \ + ContentType.C \ + DataBase.C \ + DataTask.C \ + DataRepository.C \ + Dispatch.C \ + EntityList.C \ + Expression.C \ + ExprList.C \ + FirstOf.C \ + FlexBuffer.C \ + GenericId.C \ + gr_type.C \ + GraphicsTask.C \ + Handler.C \ + LcfTask.C \ + NodeData.C \ + NodeTask.C \ + OL_Data.C \ + OLAF.C \ + ReplaceIdIdref.C \ + SGMLDefn.C \ + SGMLName.C \ + SearchEng.C \ + SearchPath.C \ + SearchStorage.C \ + StringList.C \ + StyleTask.C \ + StyleTaskDB.C \ + StyleValidate.C \ + TOCTask.C \ + Task.C \ + Token.C \ + lex.ll + +NodeParser_SOURCES = NodeParser.C $(OLAFPARSESRC) +NCFGen_SOURCES = NCFGen.C $(OLAFPARSESRC) +MixedGen_SOURCES = MixedGen.C RemoteId.C $(OLAFPARSESRC) +StyleUpdate_SOURCES = StyleUpdate.C $(OLAFPARSESRC) + +AM_LFLAGS = -Cf -L -8 -s +AM_YFLAGS = -d + +CLEANFILES = OL_DataExpr.C \ + OL_DataExpr.tab.h \ + ContentType.C \ + ReplaceIdIdref.C \ + RemoteId.C \ + gr_type.C + +OL_DataExpr.C: OL_DataExpr.yy + $(YACC) $(AM_YFLAGS) -p ol_data -b OL_DataExpr $< + mv OL_DataExpr.tab.c $@ + +ContentType.C: ContentType.ll OL_DataExpr.C + $(LEX) $(AM_LFLAGS) -P ol_data -o $@ $< + +ReplaceIdIdref.C: ReplaceIdIdref.ll + $(LEX) $(AM_LFLAGS) -P nodedata -o $@ $< + +RemoteId.C: RemoteId.ll + $(LEX) $(AM_LFLAGS) -P remote -o $@ $< + +gr_type.C: gr_type.ll + $(LEX) $(AM_LFLAGS) -P graphics_task -o $@ $<