Skip to content

Commit

Permalink
Merge pull request #1690 from GillesDuvert/solve_1689
Browse files Browse the repository at this point in the history
minimal changes for bug #1689
  • Loading branch information
GillesDuvert authored Dec 15, 2023
2 parents 44a497b + f60593f commit 54752ab
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
22 changes: 11 additions & 11 deletions src/FMTOut.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ void FMTOut::f(RefFMTNode _t) {
SizeT tCount = actPar->OFmtA( os, valIx, r, w, c);
r -= tCount;
NextVal( tCount);
if( actPar == NULL) break;
if( actPar == NULL) {termFlag=true; break;};
} while( r>0);

break;
Expand All @@ -267,7 +267,7 @@ void FMTOut::f(RefFMTNode _t) {
SizeT tCount = actPar->OFmtF( os, valIx, r, w, d, c, BaseGDL::FIXED);
r -= tCount;
NextVal( tCount);
if( actPar == NULL) break;
if( actPar == NULL) {termFlag=true; break;};
} while( r>0);

break;
Expand All @@ -288,7 +288,7 @@ void FMTOut::f(RefFMTNode _t) {
SizeT tCount = actPar->OFmtF( os, valIx, r, w, d, c, BaseGDL::SCIENTIFIC);
r -= tCount;
NextVal( tCount);
if( actPar == NULL) break;
if( actPar == NULL) {termFlag=true; break;};
} while( r>0);

break;
Expand All @@ -310,7 +310,7 @@ void FMTOut::f(RefFMTNode _t) {
SizeT tCount = actPar->OFmtF( os, valIx, r, w, d, c, BaseGDL::SCIENTIFIC);
r -= tCount;
NextVal( tCount);
if( actPar == NULL) break;
if( actPar == NULL) {termFlag=true; break;};
} while( r>0);

break;
Expand All @@ -331,7 +331,7 @@ void FMTOut::f(RefFMTNode _t) {
SizeT tCount = actPar->OFmtF( os, valIx, r, w, d, c, BaseGDL::AUTO);
r -= tCount;
NextVal( tCount);
if( actPar == NULL) break;
if( actPar == NULL) {termFlag=true; break;};
} while( r>0);

break;
Expand All @@ -353,7 +353,7 @@ void FMTOut::f(RefFMTNode _t) {
SizeT tCount = actPar->OFmtF( os, valIx, r, w, d, c, BaseGDL::AUTO);
r -= tCount;
NextVal( tCount);
if( actPar == NULL) break;
if( actPar == NULL) {termFlag=true; break;};
} while( r>0);

break;
Expand All @@ -374,7 +374,7 @@ void FMTOut::f(RefFMTNode _t) {
SizeT tCount = actPar->OFmtI( os, valIx, r, w, d, c, BaseGDL::DEC);
r -= tCount;
NextVal( tCount);
if( actPar == NULL) break;
if( actPar == NULL) {termFlag=true; break;};
} while( r>0);

break;
Expand All @@ -395,7 +395,7 @@ void FMTOut::f(RefFMTNode _t) {
SizeT tCount = actPar->OFmtI( os, valIx, r, w, d, c, BaseGDL::OCT);
r -= tCount;
NextVal( tCount);
if( actPar == NULL) break;
if( actPar == NULL) {termFlag=true; break;};
} while( r>0);

break;
Expand All @@ -416,7 +416,7 @@ void FMTOut::f(RefFMTNode _t) {
SizeT tCount = actPar->OFmtI( os, valIx, r, w, d, c, BaseGDL::BIN);
r -= tCount;
NextVal( tCount);
if( actPar == NULL) break;
if( actPar == NULL) {termFlag=true; break;};
} while( r>0);

break;
Expand All @@ -437,7 +437,7 @@ void FMTOut::f(RefFMTNode _t) {
SizeT tCount = actPar->OFmtI( os, valIx, r, w, d, c, BaseGDL::HEX);
r -= tCount;
NextVal( tCount);
if( actPar == NULL) break;
if( actPar == NULL) {termFlag=true; break;};
} while( r>0);

break;
Expand All @@ -458,7 +458,7 @@ void FMTOut::f(RefFMTNode _t) {
SizeT tCount = actPar->OFmtI( os, valIx, r, w, d, c, BaseGDL::HEXL);
r -= tCount;
NextVal( tCount);
if( actPar == NULL) break;
if( actPar == NULL) {termFlag=true; break;};
} while( r>0);

break;
Expand Down
22 changes: 11 additions & 11 deletions src/format.out.g
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ f
SizeT tCount = actPar->OFmtA( os, valIx, r, w, c);
r -= tCount;
NextVal( tCount);
if( actPar == NULL) break;
if( actPar == NULL) {termFlag=true; break;};
} while( r>0);
}
// | d:D // D is transformed to F below:
Expand All @@ -340,7 +340,7 @@ f
SizeT tCount = actPar->OFmtF( os, valIx, r, w, d, c, BaseGDL::FIXED);
r -= tCount;
NextVal( tCount);
if( actPar == NULL) break;
if( actPar == NULL) {termFlag=true; break;};
} while( r>0);
}
| se:SE
Expand All @@ -355,7 +355,7 @@ f
SizeT tCount = actPar->OFmtF( os, valIx, r, w, d, c, BaseGDL::SCIENTIFIC);
r -= tCount;
NextVal( tCount);
if( actPar == NULL) break;
if( actPar == NULL) {termFlag=true; break;};
} while( r>0);
}
| ee:E
Expand All @@ -371,7 +371,7 @@ f
SizeT tCount = actPar->OFmtF( os, valIx, r, w, d, c, BaseGDL::SCIENTIFIC);
r -= tCount;
NextVal( tCount);
if( actPar == NULL) break;
if( actPar == NULL) {termFlag=true; break;};
} while( r>0);
}
| sg:SG
Expand All @@ -386,7 +386,7 @@ f
SizeT tCount = actPar->OFmtF( os, valIx, r, w, d, c, BaseGDL::AUTO);
r -= tCount;
NextVal( tCount);
if( actPar == NULL) break;
if( actPar == NULL) {termFlag=true; break;};
} while( r>0);
}
| g:G
Expand All @@ -402,7 +402,7 @@ f
SizeT tCount = actPar->OFmtF( os, valIx, r, w, d, c, BaseGDL::AUTO);
r -= tCount;
NextVal( tCount);
if( actPar == NULL) break;
if( actPar == NULL) {termFlag=true; break;};
} while( r>0);
}
| i:I
Expand All @@ -417,7 +417,7 @@ f
SizeT tCount = actPar->OFmtI( os, valIx, r, w, d, c, BaseGDL::DEC);
r -= tCount;
NextVal( tCount);
if( actPar == NULL) break;
if( actPar == NULL) {termFlag=true; break;};
} while( r>0);
}
| o:O
Expand All @@ -432,7 +432,7 @@ f
SizeT tCount = actPar->OFmtI( os, valIx, r, w, d, c, BaseGDL::OCT);
r -= tCount;
NextVal( tCount);
if( actPar == NULL) break;
if( actPar == NULL) {termFlag=true; break;};
} while( r>0);
}
| b:B
Expand All @@ -447,7 +447,7 @@ f
SizeT tCount = actPar->OFmtI( os, valIx, r, w, d, c, BaseGDL::BIN);
r -= tCount;
NextVal( tCount);
if( actPar == NULL) break;
if( actPar == NULL) {termFlag=true; break;};
} while( r>0);
}
| z:Z
Expand All @@ -462,7 +462,7 @@ f
SizeT tCount = actPar->OFmtI( os, valIx, r, w, d, c, BaseGDL::HEX);
r -= tCount;
NextVal( tCount);
if( actPar == NULL) break;
if( actPar == NULL) {termFlag=true; break;};
} while( r>0);
}
| zz:ZZ
Expand All @@ -477,7 +477,7 @@ f
SizeT tCount = actPar->OFmtI( os, valIx, r, w, d, c, BaseGDL::HEXL);
r -= tCount;
NextVal( tCount);
if( actPar == NULL) break;
if( actPar == NULL) {termFlag=true; break;};
} while( r>0);
}
|
Expand Down

0 comments on commit 54752ab

Please sign in to comment.