luke
/
abc
mirror of https://github.com/YosysHQ/abc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Suggested changes for the case when the file begings with a new line.

This commit is contained in:
Alan Mishchenko 2022-03-29 15:31:13 -07:00
parent ee228339e5
commit a24b15d03a
2 changed files with 74 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/map/amap/amapRead.c
View File

@ -126,41 +126,52 @@ void Amap_RemoveComments( char * pBuffer, int * pnDots, int * pnLines )
// (in the BLIF file, comments are lines starting with "#")
nDots = nLines = 0;
for ( pCur = pBuffer; *pCur; pCur++ )
{
{
// if this is the beginning of comment
// clean it with spaces until the new line statement
if ( *pCur == '#' )
while ( *pCur != '\n' )
*pCur++ = ' ';
if ( *pCur == '#' ) {
while ( *pCur != '\n' ) {
*pCur++ = ' ';
}
}
// count the number of new lines and dots
if ( *pCur == '\n' ) {
if (*(pCur-1)=='\r') {
// DOS(R) file support
if (*(pCur-2)!='\\') nLines++;
else {
// rewind to backslash and overwrite with a space
*(pCur-2) = ' ';
*(pCur-1) = ' ';
*pCur = ' ';
if (pCur > pBuffer) {
if (*(pCur - 1) == '\r') {
// DOS(R) file support
if (pCur > (pBuffer + 1)) {
if (*(pCur - 2)!='\\') {
nLines++;
}
else {
// rewind to backslash and overwrite with a space
*(pCur - 2) = ' ';
*(pCur - 1) = ' ';
*pCur = ' ';
}
}
} else {
// UNIX(TM) file support
if (*(pCur - 1) != '\\') {
nLines++;
}
else {
// rewind to backslash and overwrite with a space
*(pCur-1) = ' ';
*pCur = ' ';
}
}
}
}
} else {
// UNIX(TM) file support
if (*(pCur-1)!='\\') nLines++;
else {
// rewind to backslash and overwrite with a space
*(pCur-1) = ' ';
*pCur = ' ';
else if ( *pCur == '.' ) {
nDots++;
}
}
}
else if ( *pCur == '.' )
nDots++;
}
}
if ( pnDots )
*pnDots = nDots;
*pnDots = nDots;
if ( pnLines )
*pnLines = nLines;
*pnLines = nLines;
}
/**Function*************************************************************
@ -491,4 +502,3 @@ Amap_Lib_t * Amap_LibReadFile( char * pFileName, int fVerbose )
ABC_NAMESPACE_IMPL_END

61
src/map/mio/mioRead.c
View File

@ -734,37 +734,48 @@ void Io_ReadFileRemoveComments( char * pBuffer, int * pnDots, int * pnLines )
// (in the BLIF file, comments are lines starting with "#")
nDots = nLines = 0;
for ( pCur = pBuffer; *pCur; pCur++ )
{
{
// if this is the beginning of comment
// clean it with spaces until the new line statement
if ( *pCur == '#' )
while ( *pCur != '\n' )
*pCur++ = ' ';
if ( *pCur == '#' ) {
while ( *pCur != '\n' ) {
*pCur++ = ' ';
}
}
// count the number of new lines and dots
if ( *pCur == '\n' ) {
if (*(pCur-1)=='\r') {
// DOS(R) file support
if (*(pCur-2)!='\\') nLines++;
else {
// rewind to backslash and overwrite with a space
*(pCur-2) = ' ';
*(pCur-1) = ' ';
*pCur = ' ';
if (pCur > pBuffer) {
if (*(pCur - 1) == '\r') {
// DOS(R) file support
if (pCur > (pBuffer + 1)) {
if (*(pCur - 2) != '\\') {
nLines++;
}
else {
// rewind to backslash and overwrite with a space
*(pCur - 2) = ' ';
*(pCur - 1) = ' ';
*pCur = ' ';
}
}
} else {
// UNIX(TM) file support
if (*(pCur - 1) != '\\') {
nLines++;
}
else {
// rewind to backslash and overwrite with a space
*(pCur - 1) = ' ';
*pCur = ' ';
}
}
}
}
} else {
// UNIX(TM) file support
if (*(pCur-1)!='\\') nLines++;
else {
// rewind to backslash and overwrite with a space
*(pCur-1) = ' ';
*pCur = ' ';
else if ( *pCur == '.' ) {
nDots++;
}
}
}
else if ( *pCur == '.' )
nDots++;
}
}
if ( pnDots )
*pnDots = nDots;
if ( pnLines )