summaryrefslogtreecommitdiffstats
path: root/src/bdd/parse/parseCore.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/bdd/parse/parseCore.c')
-rw-r--r--src/bdd/parse/parseCore.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/bdd/parse/parseCore.c b/src/bdd/parse/parseCore.c
index 88888379..85200dd9 100644
--- a/src/bdd/parse/parseCore.c
+++ b/src/bdd/parse/parseCore.c
@@ -156,7 +156,7 @@ DdNode * Parse_FormulaParser( FILE * pOutput, char * pFormulaInit, int nVars, in
}
// copy the formula
- pFormula = ALLOC( char, strlen(pFormulaInit) + 3 );
+ pFormula = ABC_ALLOC( char, strlen(pFormulaInit) + 3 );
sprintf( pFormula, "(%s)", pFormulaInit );
// start the stacks
@@ -335,7 +335,7 @@ DdNode * Parse_FormulaParser( FILE * pOutput, char * pFormulaInit, int nVars, in
if ( Parse_ParserPerformTopOp( dd, pStackFn, Oper ) == NULL )
{
fprintf( pOutput, "Parse_FormulaParser(): Unknown operation\n" );
- free( pFormula );
+ ABC_FREE( pFormula );
return NULL;
}
}
@@ -382,7 +382,8 @@ DdNode * Parse_FormulaParser( FILE * pOutput, char * pFormulaInit, int nVars, in
for ( i = 0; pTemp[i] && pTemp[i] != ' ' && pTemp[i] != '\t' && pTemp[i] != '\r' && pTemp[i] != '\n' &&
pTemp[i] != PARSE_SYM_AND1 && pTemp[i] != PARSE_SYM_AND2 && pTemp[i] != PARSE_SYM_XOR1 &&
pTemp[i] != PARSE_SYM_XOR2 && pTemp[i] != PARSE_SYM_XOR3 && pTemp[i] != PARSE_SYM_XOR &&
- pTemp[i] != PARSE_SYM_OR1 && pTemp[i] != PARSE_SYM_OR2 && pTemp[i] != PARSE_SYM_CLOSE;
+ pTemp[i] != PARSE_SYM_OR1 && pTemp[i] != PARSE_SYM_OR2 && pTemp[i] != PARSE_SYM_CLOSE &&
+ pTemp[i] != PARSE_SYM_NEGAFT;
i++ )
{}
for ( v = 0; v < nVars; v++ )
@@ -446,7 +447,7 @@ DdNode * Parse_FormulaParser( FILE * pOutput, char * pFormulaInit, int nVars, in
if ( Parse_ParserPerformTopOp( dd, pStackFn, Oper2 ) == NULL )
{
fprintf( pOutput, "Parse_FormulaParser(): Unknown operation\n" );
- free( pFormula );
+ ABC_FREE( pFormula );
return NULL;
}
Parse_StackOpPush( pStackOp, Oper1 ); // push the last operation back
@@ -471,7 +472,7 @@ DdNode * Parse_FormulaParser( FILE * pOutput, char * pFormulaInit, int nVars, in
Parse_StackFnFree(pStackFn);
Parse_StackOpFree(pStackOp);
Cudd_Deref( bFunc );
- free( pFormula );
+ ABC_FREE( pFormula );
return bFunc;
}
else
@@ -482,7 +483,7 @@ DdNode * Parse_FormulaParser( FILE * pOutput, char * pFormulaInit, int nVars, in
else
fprintf( pOutput, "Parse_FormulaParser(): The input string is empty\n" );
}
- free( pFormula );
+ ABC_FREE( pFormula );
return NULL;
}