diff options
Diffstat (limited to 'src/vhdlcode.l')
| -rw-r--r-- | src/vhdlcode.l | 175 |
1 files changed, 88 insertions, 87 deletions
diff --git a/src/vhdlcode.l b/src/vhdlcode.l index 36b7e6d..8908976 100644 --- a/src/vhdlcode.l +++ b/src/vhdlcode.l @@ -110,27 +110,27 @@ struct vhdlcodeYY_state }; -static void writeFont(yyscan_t yyscanner,const char *s,const char* text); +static void writeFont(yyscan_t yyscanner,const char *s,const QCString &text); static void generateMemLink(yyscan_t yyscanner,CodeOutputInterface &ol,QCString &clName,QCString& memberName); static bool writeColoredWord(yyscan_t yyscanner,QCString& word ); -static void generateClassOrGlobalLink(yyscan_t yyscanner,CodeOutputInterface &ol,const char *clName, bool typeOnly=false, const char *curr_class=0); +static void generateClassOrGlobalLink(yyscan_t yyscanner,CodeOutputInterface &ol,const QCString &clName, bool typeOnly=false, const QCString &curr_class=QCString()); static void setCurrentDoc(yyscan_t yyscanner,const QCString &anchor); static bool checkVhdlString(yyscan_t yyscanner,QCString &name); -static void addToSearchIndex(yyscan_t yyscanner,const char *text); +static void addToSearchIndex(yyscan_t yyscanner,const QCString &text); static void startCodeLine(yyscan_t yyscanner); static void endCodeLine(yyscan_t yyscanner); static void nextCodeLine(yyscan_t yyscanner); -static void writeWord(yyscan_t yyscanner,const char *word,const char* curr_class=0,bool classLink=false); -static void codifyLines(yyscan_t yyscanner,const char *text,const char *cl=0,bool classlink=false,bool comment=false); +static void writeWord(yyscan_t yyscanner,const QCString &word,const QCString &curr_class=QCString(),bool classLink=false); +static void codifyLines(yyscan_t yyscanner,const QCString &text,const QCString &cl=QCString(),bool classlink=false,bool comment=false); static void writeMultiLineCodeLink(yyscan_t yyscanner,CodeOutputInterface &ol, const Definition *d, - const char *text); + const QCString &text); static void generateFuncLink(yyscan_t yyscanner,CodeOutputInterface &ol,const MemberDef* mdef); static int countLines(yyscan_t yyscanner); static void endFontClass(yyscan_t yyscanner); static void startFontClass(yyscan_t yyscanner,const char *s); static void appStringLower(QCString& qcs,const char* text); -static void codifyMapLines(yyscan_t yyscanner,const char *text); +static void codifyMapLines(yyscan_t yyscanner,const QCString &text); static void writeFuncProto(yyscan_t yyscanner); static void writeProcessProto(yyscan_t yyscanner); static yy_size_t yyread(yyscan_t yyscanner,char *buf,yy_size_t max_size); @@ -228,7 +228,7 @@ XILINX "INST"|"NET"|"PIN"|"BLKNM"|"BUFG"|"COLLAPSE"|"CPLD"|"COMPGRP"|"CONFI if (ql.size()>=2) { unsigned int index=0; - QCString t1=ql[0]; + QCString t1(ql[0]); char cc=t1.at(index); while (cc==' ' || cc=='\t') { @@ -259,7 +259,7 @@ XILINX "INST"|"NET"|"PIN"|"BLKNM"|"BUFG"|"COLLAPSE"|"CPLD"|"COMPGRP"|"CONFI } codifyLines(yyscanner,"=>"); index=0; - QCString s2=ql[1]; + QCString s2(ql[1]); t1=s2; cc=t1.at(index); while (cc==' ' || cc=='\t') @@ -287,7 +287,7 @@ XILINX "INST"|"NET"|"PIN"|"BLKNM"|"BUFG"|"COLLAPSE"|"CPLD"|"COMPGRP"|"CONFI } else { - codifyLines(yyscanner,yytext,yyextra->currClass.data()); + codifyLines(yyscanner,yytext,yyextra->currClass); } BEGIN(Map); } @@ -353,7 +353,7 @@ XILINX "INST"|"NET"|"PIN"|"BLKNM"|"BUFG"|"COLLAPSE"|"CPLD"|"COMPGRP"|"CONFI <ParseType>{ENDEFUNC} { QCString tt(yytext); - codifyLines(yyscanner,yytext,yyextra->currClass.data()); + codifyLines(yyscanner,yytext,yyextra->currClass); tt=tt.lower(); VhdlDocGen::deleteAllChars(tt,';'); tt.stripWhiteSpace(); @@ -374,12 +374,12 @@ XILINX "INST"|"NET"|"PIN"|"BLKNM"|"BUFG"|"COLLAPSE"|"CPLD"|"COMPGRP"|"CONFI } <ParseType>{END1} { - codifyLines(yyscanner,yytext,yyextra->currClass.data()); + codifyLines(yyscanner,yytext,yyextra->currClass); yyextra->vhdlKeyDict.clear(); } <ParseType>^{B}*("begin "|"begin") { - codifyLines(yyscanner,yytext,yyextra->currClass.data()); + codifyLines(yyscanner,yytext,yyextra->currClass); yyextra->isFuncProto=false; } @@ -387,7 +387,7 @@ XILINX "INST"|"NET"|"PIN"|"BLKNM"|"BUFG"|"COLLAPSE"|"CPLD"|"COMPGRP"|"CONFI yyextra->funcProto.append(yytext); if (yyextra->isProto) { - codifyLines(yyscanner,yytext,yyextra->currClass.data()); + codifyLines(yyscanner,yytext,yyextra->currClass); } } @@ -412,7 +412,7 @@ XILINX "INST"|"NET"|"PIN"|"BLKNM"|"BUFG"|"COLLAPSE"|"CPLD"|"COMPGRP"|"CONFI if (VhdlDocGen::isNumber(val.str())) { startFontClass(yyscanner,"vhdllogic"); - codifyLines(yyscanner,yytext,yyextra->currClass.data()); + codifyLines(yyscanner,yytext,yyextra->currClass); endFontClass(yyscanner); } else @@ -422,7 +422,7 @@ XILINX "INST"|"NET"|"PIN"|"BLKNM"|"BUFG"|"COLLAPSE"|"CPLD"|"COMPGRP"|"CONFI } else { - codifyLines(yyscanner,yytext,yyextra->currClass.data()); + codifyLines(yyscanner,yytext,yyextra->currClass); } } } @@ -580,7 +580,7 @@ XILINX "INST"|"NET"|"PIN"|"BLKNM"|"BUFG"|"COLLAPSE"|"CPLD"|"COMPGRP"|"CONFI std::string s3=strl[2]; s1.append("."); s3.insert(0,"."); - codifyLines(yyscanner,s1.c_str(),yyextra->currClass.data()); + codifyLines(yyscanner,s1.c_str(),yyextra->currClass); ClassDef *cd=VhdlDocGen::getPackageName(s2.c_str()); if (cd) { @@ -606,27 +606,27 @@ XILINX "INST"|"NET"|"PIN"|"BLKNM"|"BUFG"|"COLLAPSE"|"CPLD"|"COMPGRP"|"CONFI if (j>0) { QCString left=tt.left(j+1); - codifyLines(yyscanner,left.data()); + codifyLines(yyscanner,left); tt=tt.right(tt.length()-j-1); - left=VhdlDocGen::getIndexWord(tt.data(),0); + left=VhdlDocGen::getIndexWord(tt,0); if (!left.isEmpty()) { if (left.contains('(')) { j=left.find('(',false); QCString name=left.left(j); - generateClassOrGlobalLink(yyscanner,*yyextra->code,name.data()); + generateClassOrGlobalLink(yyscanner,*yyextra->code,name); yyextra->PortMapComp=name; name=tt.right(tt.length()-name.length()); - codifyLines(yyscanner,name.data()); + codifyLines(yyscanner,name); } else { - generateClassOrGlobalLink(yyscanner,*yyextra->code,left.data()); - tt.stripPrefix(left.data()); //=tt.right(tt.length()-left.length()-1); + generateClassOrGlobalLink(yyscanner,*yyextra->code,left); + tt.stripPrefix(left); //=tt.right(tt.length()-left.length()-1); yyextra->PortMapComp=left; - codifyLines(yyscanner,tt.data()); + codifyLines(yyscanner,tt); } } } @@ -634,11 +634,11 @@ XILINX "INST"|"NET"|"PIN"|"BLKNM"|"BUFG"|"COLLAPSE"|"CPLD"|"COMPGRP"|"CONFI { if (tt.contains(':',false)) { - codifyMapLines(yyscanner,tt.data()); + codifyMapLines(yyscanner,tt); } else { - codifyLines(yyscanner,tt.data()); + codifyLines(yyscanner,tt); } } yyextra->braceCount=1; @@ -651,7 +651,7 @@ XILINX "INST"|"NET"|"PIN"|"BLKNM"|"BUFG"|"COLLAPSE"|"CPLD"|"COMPGRP"|"CONFI temp=temp.stripWhiteSpace(); VhdlDocGen::deleteAllChars(temp,'\n'); yyextra->tempComp=temp; - codifyLines(yyscanner,yytext,temp.data(),true); + codifyLines(yyscanner,yytext,temp,true); yyextra->braceCount=0; yyextra->isComponent=true; BEGIN(ParseComponent); @@ -667,7 +667,7 @@ XILINX "INST"|"NET"|"PIN"|"BLKNM"|"BUFG"|"COLLAPSE"|"CPLD"|"COMPGRP"|"CONFI temp+=VhdlDocGen::getIndexWord(yytext,1); yyextra->currClass=temp; VhdlDocGen::deleteAllChars(temp,'\n'); - codifyLines(yyscanner,yytext,temp.data(),true); + codifyLines(yyscanner,yytext,temp,true); yyextra->isPackageBody=false; } @@ -677,10 +677,10 @@ XILINX "INST"|"NET"|"PIN"|"BLKNM"|"BUFG"|"COLLAPSE"|"CPLD"|"COMPGRP"|"CONFI QCString temp=VhdlDocGen::getIndexWord(yytext,2); StringVector ql=split(yytext,temp.str()); std::string ll=ql[0]; - codifyLines(yyscanner,ll.c_str(),yyextra->currClass.data()); + codifyLines(yyscanner,ll.c_str(),yyextra->currClass); temp=temp.stripWhiteSpace(); temp.prepend("_"); - generateClassOrGlobalLink(yyscanner,*yyextra->code,temp.data()); + generateClassOrGlobalLink(yyscanner,*yyextra->code,temp); yyextra->currClass.resize(0); yyextra->currClass=temp; yyextra->isProto=false; @@ -743,13 +743,13 @@ XILINX "INST"|"NET"|"PIN"|"BLKNM"|"BUFG"|"COLLAPSE"|"CPLD"|"COMPGRP"|"CONFI } <Bases>"end"{BN}+"architecture"{BN}+{FUNCNAME} { - codifyLines(yyscanner,yytext,yyextra->currClass.data(),true); + codifyLines(yyscanner,yytext,yyextra->currClass,true); yyextra->currArch = false; } <Bases>"end"{BN}+{FUNCNAME} { if (yyextra->currArch) { - codifyLines(yyscanner,yytext,yyextra->currClass.data(),true); + codifyLines(yyscanner,yytext,yyextra->currClass,true); yyextra->currArch = false; } else @@ -772,7 +772,7 @@ XILINX "INST"|"NET"|"PIN"|"BLKNM"|"BUFG"|"COLLAPSE"|"CPLD"|"COMPGRP"|"CONFI if (!writeColoredWord(yyscanner,temp)) { - generateClassOrGlobalLink(yyscanner,*yyextra->code,temp.data()); + generateClassOrGlobalLink(yyscanner,*yyextra->code,temp); } } <End>";" { @@ -810,7 +810,7 @@ XILINX "INST"|"NET"|"PIN"|"BLKNM"|"BUFG"|"COLLAPSE"|"CPLD"|"COMPGRP"|"CONFI } <Bases>^{B}*("use"){BN}+("entity"|"component")[^\n]* { - codifyLines(yyscanner,yytext,yyextra->currClass.data(),true); + codifyLines(yyscanner,yytext,yyextra->currClass,true); } @@ -859,7 +859,7 @@ XILINX "INST"|"NET"|"PIN"|"BLKNM"|"BUFG"|"COLLAPSE"|"CPLD"|"COMPGRP"|"CONFI <Bases>^{B}*{XILINX}/[^a-zA-Z0-9_] { writeWord(yyscanner,yytext); - //codifyLines(yyscanner,yytext,yyextra->currClass.data(),true); + //codifyLines(yyscanner,yytext,yyextra->currClass,true); } <Bases>^{B}*"set_"[^\n]* { @@ -969,7 +969,7 @@ static bool checkVhdlString(yyscan_t yyscanner,QCString &name) else { startFontClass(yyscanner,"keyword"); - yyextra->code->codify(name.data()); + yyextra->code->codify(name); endFontClass(yyscanner); } return true; @@ -978,14 +978,14 @@ static bool checkVhdlString(yyscan_t yyscanner,QCString &name) if (VhdlDocGen::isNumber(name.str())) { startFontClass(yyscanner,"vhdllogic"); - yyextra->code->codify(name.data()); + yyextra->code->codify(name); endFontClass(yyscanner); return true; } return false; } -static void addToSearchIndex(yyscan_t yyscanner,const char *text) +static void addToSearchIndex(yyscan_t yyscanner,const QCString &text) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; if (Doxygen::searchIndex) @@ -1011,14 +1011,14 @@ static void startCodeLine(yyscan_t yyscanner) // if ((yyextra->yyLineNr % 500) == 0) // fprintf(stderr,"\n starting Line %d:",yyextra->yyLineNr); const Definition *d = yyextra->sourceFileDef->getSourceDefinition(yyextra->yyLineNr); - //printf("startCodeLine %d d=%s\n", yyextra->yyLineNr,d ? d->name().data() : "<null>"); + //printf("startCodeLine %d d=%s\n", yyextra->yyLineNr,qPrint(d ? d->name()) : "<null>"); if (!yyextra->includeCodeFragment && d) { yyextra->currentDefinition = d; yyextra->currentMemberDef = yyextra->sourceFileDef->getSourceMember(yyextra->yyLineNr); if (!yyextra->tempComp.isEmpty() && yyextra->currentMemberDef ) { - //ClassDef *cf=VhdlDocGen::getClass(yyextra->tempComp.data()); + //ClassDef *cf=VhdlDocGen::getClass(yyextra->tempComp); QCString nn=yyextra->currentMemberDef->name(); const MemberDef* mdeff=VhdlDocGen::findMember(yyextra->tempComp,nn); if (mdeff) @@ -1040,13 +1040,13 @@ static void startCodeLine(yyscan_t yyscanner) { yyextra->code->writeLineNumber(d->getReference(), d->getOutputFileBase(), - 0,yyextra->yyLineNr); + QCString(),yyextra->yyLineNr); setCurrentDoc(yyscanner,lineAnchor); } } else { - yyextra->code->writeLineNumber(0,0,0,yyextra->yyLineNr); + yyextra->code->writeLineNumber(QCString(),QCString(),QCString(),yyextra->yyLineNr); } } yyextra->code->startCodeLine(yyextra->sourceFileDef); @@ -1084,7 +1084,7 @@ static void nextCodeLine(yyscan_t yyscanner) * and will be linked. */ -static void writeWord(yyscan_t yyscanner,const char *word,const char* curr_class,bool classLink) +static void writeWord(yyscan_t yyscanner,const QCString &word,const QCString &curr_class,bool classLink) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; bool found=false; @@ -1102,8 +1102,8 @@ static void writeWord(yyscan_t yyscanner,const char *word,const char* curr_class if (!writeColoredWord(yyscanner,temp)) // is it a keyword ? { //if (VhdlDocGen::findKeyWord(temp)) - // writeFont(yyscanner,"vhdlkeyword",temp.data()); - //printf("writeWord: %s\n",temp.data()); + // writeFont(yyscanner,"vhdlkeyword",temp); + //printf("writeWord: %s\n",qPrint(temp)); if (!tclass.isEmpty()) { if (!classLink) @@ -1119,7 +1119,7 @@ static void writeWord(yyscan_t yyscanner,const char *word,const char* curr_class { if (!checkVhdlString(yyscanner,temp)) { - yyextra->code->codify(temp.data()); + yyextra->code->codify(temp); } } } @@ -1156,16 +1156,16 @@ static void writeWord(yyscan_t yyscanner,const char *word,const char* curr_class } else { - QCString qc(temp.data()); + QCString qc(temp); if (VhdlDocGen::isNumber(qc.str())) { startFontClass(yyscanner,"vhdllogic"); - yyextra->code->codify(temp.data()); + yyextra->code->codify(temp); endFontClass(yyscanner); } else { - yyextra->code->codify(temp.data()); + yyextra->code->codify(temp); } } } @@ -1176,12 +1176,12 @@ static void writeWord(yyscan_t yyscanner,const char *word,const char* curr_class /*! write a code fragment 'text' that may span multiple lines, inserting * line numbers for each line. */ -static void codifyLines(yyscan_t yyscanner,const char *text,const char *cl,bool classlink,bool comment) +static void codifyLines(yyscan_t yyscanner,const QCString &text,const QCString &cl,bool classlink,bool comment) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - if (text==0) return; + if (text.isEmpty()) return; //printf("codifyLines(%d,\"%s\")\n",yyextra->yyLineNr,text); - const char *p=text,*sp=p; + const char *p=text.data(),*sp=p; char c; bool done=false; while (!done) @@ -1195,7 +1195,7 @@ static void codifyLines(yyscan_t yyscanner,const char *text,const char *cl,bool line = line.left((int)(p-sp)-1); if (comment) { - writeFont(yyscanner,"comment",line.data()); + writeFont(yyscanner,"comment",line); } else { @@ -1224,9 +1224,10 @@ static void codifyLines(yyscan_t yyscanner,const char *text,const char *cl,bool */ static void writeMultiLineCodeLink(yyscan_t yyscanner,CodeOutputInterface &ol, const Definition *d, - const char *text) + const QCString &text) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; + if (text.isEmpty()) return; static bool sourceTooltips = Config_getBool(SOURCE_TOOLTIPS); TooltipManager::instance().addTooltip(ol,d); QCString ref = d->getReference(); @@ -1238,18 +1239,17 @@ static void writeMultiLineCodeLink(yyscan_t yyscanner,CodeOutputInterface &ol, tooltip = d->briefDescriptionAsTooltip(); } bool done=false; - char *p=(char *)text; + const char *p=text.data(); while (!done) { - char *sp=p; + const char *sp=p; char c; while ((c=*p++) && c!='\n') {} if (c=='\n') { yyextra->yyLineNr++; - *(p-1)='\0'; // printf("writeCodeLink(%s,%s,%s,%s)\n",ref,file,anchor,sp); - ol.writeCodeLink(ref,file,anchor,sp,tooltip); + ol.writeCodeLink(ref,file,anchor,QCString(sp,p-sp-1),tooltip); nextCodeLine(yyscanner); } else @@ -1264,7 +1264,7 @@ static void writeMultiLineCodeLink(yyscan_t yyscanner,CodeOutputInterface &ol, */ static void generateFuncLink(yyscan_t yyscanner,CodeOutputInterface &ol,const MemberDef* mdef) { - //printf("generateFuncLink(FuncName=%s)\n",mdef->name().data()); + //printf("generateFuncLink(FuncName=%s)\n",qPrint(mdef->name())); QCString memberName=mdef->name(); if (mdef->isLinkable()) // is it a linkable class @@ -1273,7 +1273,7 @@ static void generateFuncLink(yyscan_t yyscanner,CodeOutputInterface &ol,const Me addToSearchIndex(yyscanner,memberName); return; } - codifyLines(yyscanner,memberName.data()); + codifyLines(yyscanner,memberName); addToSearchIndex(yyscanner,memberName); } // generateFuncLink @@ -1283,7 +1283,7 @@ static void generateMemLink(yyscan_t yyscanner,CodeOutputInterface &ol,QCString if (memberName.isEmpty()) return; if (clName.isEmpty()) { - codifyLines(yyscanner,memberName.data()); + codifyLines(yyscanner,memberName); return; } @@ -1294,7 +1294,7 @@ static void generateMemLink(yyscan_t yyscanner,CodeOutputInterface &ol,QCString //bool isLocal=false; const MemberDef *md=VhdlDocGen::findMember(className,memberName); - ClassDef *po=VhdlDocGen::getClass(className.data()); + ClassDef *po=VhdlDocGen::getClass(className); if (md==0 && po && (VhdlDocGen::VhdlClasses)po->protection()==VhdlDocGen::PACKBODYCLASS) { @@ -1310,12 +1310,13 @@ static void generateMemLink(yyscan_t yyscanner,CodeOutputInterface &ol,QCString return; } // nothing found, just write out the word - codifyLines(yyscanner,memberName.data()); + codifyLines(yyscanner,memberName); addToSearchIndex(yyscanner,memberName); }// generateMemLink -static void generateClassOrGlobalLink(yyscan_t yyscanner,CodeOutputInterface &ol,const char *clName, bool /*typeOnly*/, const char *curr_class) +static void generateClassOrGlobalLink(yyscan_t yyscanner,CodeOutputInterface &ol, + const QCString &clName, bool /*typeOnly*/, const QCString &curr_class) { QCString className=clName; @@ -1325,8 +1326,8 @@ static void generateClassOrGlobalLink(yyscan_t yyscanner,CodeOutputInterface &ol //MemberDef *md=0; //bool isLocal=false; className.stripPrefix("_"); - cd = getClass(className.data()); - if (!cd && curr_class) + cd = getClass(className); + if (!cd && !curr_class.isEmpty()) { QCString cls = curr_class; QCString suffix = "::"; @@ -1409,10 +1410,10 @@ static void startFontClass(yyscan_t yyscanner,const char *s) yyextra->currentFontClass=s; } -static void writeFont(yyscan_t yyscanner,const char *s,const char* text) +static void writeFont(yyscan_t yyscanner,const char *s,const QCString &text) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - if (s==0 || text==0) return; + if (s==0 || text.isEmpty()) return; //printf("writeFont(yyscanner,%d,\"%s\")\n",yyextra->yyLineNr,text); yyextra->code->startFontClass(s); yyextra->code->codify(text); @@ -1429,16 +1430,16 @@ static void appStringLower(QCString& qcs,const char* text) } /* writes and links a port map statement */ -static void codifyMapLines(yyscan_t yyscanner,const char *text) +static void codifyMapLines(yyscan_t yyscanner,const QCString &text) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - if (text==0) return; + if (text.isEmpty()) return; QCString temp; //bool dot=false; int wordCounter=0; QCString ctemp; - //printf("codifyMapLines(%d,\"%s\")\n",yyextra->yyLineNr,text); - const char *p=text; //,*sp=p; + //printf("codifyMapLines(%d,\"%s\")\n",yyextra->yyLineNr,qPrint(text)); + const char *p=text.data(); char c; bool done=false; while (!done) @@ -1477,7 +1478,7 @@ static void codifyMapLines(yyscan_t yyscanner,const char *text) } } ctemp.fill(c,1); - codifyLines(yyscanner,ctemp.data()); + codifyLines(yyscanner,ctemp); ctemp.resize(0); temp.resize(0); }//while @@ -1495,13 +1496,13 @@ static void writeFuncProto(yyscan_t yyscanner) if (name.isEmpty()) { - codifyLines(yyscanner,yyextra->funcProto.data(),yyextra->currClass.data()); + codifyLines(yyscanner,yyextra->funcProto,yyextra->currClass); return; } StringVector qlist=split(yyextra->funcProto.str(),name.str()); - QCString temp=qlist[0]; - codifyLines(yyscanner,temp.data(),yyextra->currClass.data()); - yyextra->funcProto.stripPrefix(temp.data()); + QCString temp(qlist[0]); + codifyLines(yyscanner,temp,yyextra->currClass); + yyextra->funcProto.stripPrefix(temp); temp.resize(0); temp=yyextra->currClass; if (yyextra->isPackageBody) @@ -1513,12 +1514,12 @@ static void writeFuncProto(yyscan_t yyscanner) if (mdef) { generateFuncLink(yyscanner,*yyextra->code,mdef); - yyextra->funcProto.stripPrefix(name.data()); - codifyLines(yyscanner,yyextra->funcProto.data(),yyextra->currClass.data()); + yyextra->funcProto.stripPrefix(name); + codifyLines(yyscanner,yyextra->funcProto,yyextra->currClass); } else { - codifyLines(yyscanner,yyextra->funcProto.data(),yyextra->currClass.data()); + codifyLines(yyscanner,yyextra->funcProto,yyextra->currClass); } }// writeFuncProto @@ -1527,7 +1528,7 @@ static void writeFuncProto(yyscan_t yyscanner) static void writeProcessProto(yyscan_t yyscanner) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - codifyLines(yyscanner,yyextra->funcProto.data(),yyextra->currClass.data()); + codifyLines(yyscanner,yyextra->funcProto,yyextra->currClass); yyextra->vhdlKeyDict.clear(); }// writeProcessProto @@ -1539,7 +1540,7 @@ static bool writeColoredWord(yyscan_t yyscanner,QCString& word ) const char *ss=VhdlDocGen::findKeyWord(qcs); if (ss) { - writeFont(yyscanner,ss,word.data()); + writeFont(yyscanner,ss,word); return true; } return false; @@ -1573,11 +1574,11 @@ void VHDLCodeParser::resetCodeParserState() } void VHDLCodeParser::parseCode(CodeOutputInterface &od, - const char *className, + const QCString &className, const QCString &s, SrcLangExt, bool exBlock, - const char *exName, + const QCString &exName, FileDef *fd, int startLine, int endLine, @@ -1591,7 +1592,7 @@ void VHDLCodeParser::parseCode(CodeOutputInterface &od, struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; //printf("***parseCode() exBlock=%d exName=%s fd=%p\n",exBlock,exName,fd); if (s.isEmpty()) return; - printlex(yy_flex_debug, true, __FILE__, fd ? fd->fileName().data(): NULL); + printlex(yy_flex_debug, true, __FILE__, fd ? qPrint(fd->fileName()): NULL); if (memberDef) { const ClassDef *dd=memberDef->getClassDef(); @@ -1599,7 +1600,7 @@ void VHDLCodeParser::parseCode(CodeOutputInterface &od, } resetCodeParserState(); yyextra->code = &od; - yyextra->inputString = s; + yyextra->inputString = s.data(); yyextra->inputPosition = 0; yyextra->currentFontClass = 0; yyextra->needsTermination = false; @@ -1664,7 +1665,7 @@ void VHDLCodeParser::parseCode(CodeOutputInterface &od, // write the tooltips TooltipManager::instance().writeTooltips(od); - printlex(yy_flex_debug, false, __FILE__, fd ? fd->fileName().data(): NULL); + printlex(yy_flex_debug, false, __FILE__, fd ? qPrint(fd->fileName()): NULL); } #if USE_STATE2STRING |