cml/libcm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmCsv.c Included some input file line numbers in some error message.

Browse Source
This commit is contained in:
kevin 2012-12-03 17:07:47 -08:00
parent 24bcde77ac
commit 36430c0d0a
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmCsv.c
View File

@ -330,7 +330,7 @@ cmCsvRC_t _cmCsvAllocCell( cmCsv_t* p, unsigned symId, unsigned flags, unsigned
// allocate cell memory // allocate cell memory
if(( cp = cmLHeapAllocZ(p->heapH, sizeof(cmCsvCell_t) )) == NULL ) if(( cp = cmLHeapAllocZ(p->heapH, sizeof(cmCsvCell_t) )) == NULL )
return _cmCsvError(p,kMemAllocErrCsvRC,"Cell allocation failed. for row: %i column %i.",cellRow,cellCol); return _cmCsvError(p,kMemAllocErrCsvRC,"Cell allocation failed. for row: %i column %i.",cellRow+1,cellCol+1);
cp->row = cellRow; cp->row = cellRow;
cp->col = cellCol; cp->col = cellCol;
@ -482,7 +482,7 @@ cmCsvRC_t cmCsvParse( cmCsvH_t h, const char* buf, unsigned bufCharCnt, uns
{ {
const cmCsvUdef_t* u; const cmCsvUdef_t* u;
if((u = _cmCsvFindUdef(p,lexTId)) == NULL ) if((u = _cmCsvFindUdef(p,lexTId)) == NULL )
rc = _cmCsvError(p, kSyntaxErrCsvRC, "Unrecognized token type: '%s' for token: '%s'.",cmLexIdToLabel(p->lexH,lexTId),buf); rc = _cmCsvError(p, kSyntaxErrCsvRC, "Unrecognized token type: '%s' for token: '%s' row:%i col:%i.",cmLexIdToLabel(p->lexH,lexTId),buf,csvRowIdx+1,csvColIdx+1);
else else
flags = kStrCsvTFl | kUdefCsvTFl; flags = kStrCsvTFl | kUdefCsvTFl;
} }
@ -490,9 +490,12 @@ cmCsvRC_t cmCsvParse( cmCsvH_t h, const char* buf, unsigned bufCharCnt, uns
// if no error occurred and the token is not a comma and the cell is not empty // if no error occurred and the token is not a comma and the cell is not empty
if( rc == kOkCsvRC && lexTId != kCommaLexTId && strlen(buf) > 0 ) if( rc == kOkCsvRC && lexTId != kCommaLexTId && strlen(buf) > 0 )
rc = _cmCsvCreateCell( p, buf,flags, csvRowIdx, csvColIdx, lexTId ); if((rc = _cmCsvCreateCell( p, buf,flags, csvRowIdx, csvColIdx, lexTId )) != kOkCsvRC )
rc = _cmCsvError(p,rc,"CSV cell create fail on row:%i col:%i\n",csvRowIdx+1,csvColIdx+1);
} }
if( lexTId == kErrorLexTId )
rc = _cmCsvError(p, kSyntaxErrCsvRC,"The lexer encountered an unrecognized token row:%i col:%i.",csvRowIdx+1,csvColIdx+1);
return rc; return rc;
} }